[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD)

[Guillaume Alaux]

    Date: Sunday, May 11, 2014 @ 20:46:56
  Author: guillaume
Revision: 212284

Cosmetic rearrange of PKGBUILD

Modified:
  java7-openjdk/trunk/PKGBUILD

----------+
 PKGBUILD |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-11 13:43:50 UTC (rev 212283)
+++ PKGBUILD	2014-05-11 18:46:56 UTC (rev 212284)
@@ -166,8 +166,11 @@
   install -d -m755 ${pkgdir}${_jvmdir}/jre
   cp -a bin lib ${pkgdir}${_jvmdir}/jre
 
+  # Set config files
   mv "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.{Ubuntu.properties.src,properties}
   mv "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.{Ubuntu.bfc,bfc}
+  mv "${pkgdir}${_jvmdir}"/jre/lib/management/jmxremote.password{.template,}
+  mv "${pkgdir}${_jvmdir}"/jre/lib/management/snmp.acl{.template,}
   rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.*.bfc
   rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.*.properties.src
   rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.properties.src
@@ -209,14 +212,8 @@
   install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/
   install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \
                  ${pkgdir}/usr/share/licenses/${pkgbase}
-
-  # link license
   ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
 
-  # Copy these template so that they can be used in _backup_etc
-  ln -fs lib/management/jmxremote.password.template lib/management/jmxremote.password
-  ln -fs lib/management/snmp.acl.template lib/management/snmp.acl
-
   # Move config files that were set in _backup_etc from ./lib to /etc
   for file in ${_backup_etc[@]}; do
     _filepkgpath=${_jvmdir}/jre/lib/${file#etc/java-7-openjdk/}
@@ -234,9 +231,9 @@
              'libpulse: for advanced sound support'
              'gtk2: for the Gtk+ look and feel - desktop usage'
              'libxtst: linked in xawt/libmawt.so - desktop usage')
-  install=jre7-openjdk.install
   provides=('java-runtime=7')
   conflicts=('openjdk6')
+  install=jre7-openjdk.install
 
   cd "${srcdir}/${_imgdir}/jre"