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

Guillaume Alaux guillaume at nymeria.archlinux.org
Fri Mar 28 13:48:19 UTC 2014


    Date: Friday, March 28, 2014 @ 14:48:19
  Author: guillaume
Revision: 208895

Add changset to filenames in 'source' array entries

This prevents file confusions between different version builds

Modified:
  java7-openjdk/trunk/PKGBUILD

----------+
 PKGBUILD |   44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-28 13:13:41 UTC (rev 208894)
+++ PKGBUILD	2014-03-28 13:48:19 UTC (rev 208895)
@@ -1,4 +1,4 @@
-# $Id$
+# $id: pkgbuild 208894 2014-03-28 13:13:41z guillaume $
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
@@ -35,13 +35,13 @@
 
 _url=http://icedtea.classpath.org/hg/release/icedtea7-forest-${_icedtea_ver:0:3}
 source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
-        openjdk.tar.gz::${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz
-        corba.tar.gz::${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz
-        jaxp.tar.gz::${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz
-        jaxws.tar.gz::${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz
-        jdk.tar.gz::${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz
-        langtools.tar.gz::${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz
-        hotspot.tar.gz::${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz
+        openjdk-${_OPENJDK_CHANGESET}.tar.gz::${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz
+        corba-${_CORBA_CHANGESET}.tar.gz::${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz
+        jaxp-${_JAXP_CHANGESET}.tar.gz::${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz
+        jaxws-${_JAXWS_CHANGESET}.tar.gz::${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz
+        jdk-${_JDK_CHANGESET}.tar.gz::${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz
+        langtools-${_LANGTOOLS_CHANGESET}.tar.gz::${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz
+        hotspot-${_HOTSPOT_CHANGESET}.tar.gz::${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz
         fontconfig-paths.diff
         openjdk7_nonreparenting-wm.diff
         jdk7-openjdk.profile
@@ -64,13 +64,13 @@
             'b7c045b08ad55a9f79390c104fa846d0e7dbb49fccffb2fab2a3824b6b19c9c8'
             '89d99d8ac269ca66e2e279aff652d5aac938a35faec93cd8cff8f048052bd3ce')
 
-noextract=("${_OPENJDK_CHANGESET}.tar.gz"
-           "${_CORBA_CHANGESET}.tar.gz"
-           "${_JAXP_CHANGESET}.tar.gz"
-           "${_JAXWS_CHANGESET}.tar.gz"
-           "${_JDK_CHANGESET}.tar.gz"
-           "${_LANGTOOLS_CHANGESET}.tar.gz"
-           "${_HOTSPOT_CHANGESET}.tar.gz")
+noextract=("openjdk-${_OPENJDK_CHANGESET}.tar.gz"
+           "corba-${_CORBA_CHANGESET}.tar.gz"
+           "jaxp-${_JAXP_CHANGESET}.tar.gz"
+           "jaxws-${_JAXWS_CHANGESET}.tar.gz"
+           "jdk-${_JDK_CHANGESET}.tar.gz"
+           "langtools-${_LANGTOOLS_CHANGESET}.tar.gz"
+           "hotspot-${_HOTSPOT_CHANGESET}.tar.gz")
 
   _jvmdir=/usr/lib/jvm/java-7-openjdk
 
@@ -102,13 +102,13 @@
         --disable-downloading --disable-Werror \
         --with-pkgversion="ArchLinux build ${pkgver}-${pkgrel}-${CARCH}" \
         --with-jdk-home=${JAVA_HOME} \
-        --with-openjdk-src-zip=${srcdir}/openjdk.tar.gz \
-        --with-hotspot-src-zip=${srcdir}/hotspot.tar.gz \
-        --with-corba-src-zip=${srcdir}/corba.tar.gz \
-        --with-jaxp-src-zip=${srcdir}/jaxp.tar.gz \
-        --with-jaxws-src-zip=${srcdir}/jaxws.tar.gz \
-        --with-jdk-src-zip=${srcdir}/jdk.tar.gz \
-        --with-langtools-src-zip=${srcdir}/langtools.tar.gz \
+        --with-openjdk-src-zip=${srcdir}/openjdk-${_OPENJDK_CHANGESET}.tar.gz \
+        --with-hotspot-src-zip=${srcdir}/hotspot-${_HOTSPOT_CHANGESET}.tar.gz \
+        --with-corba-src-zip=${srcdir}/corba-${_CORBA_CHANGESET}.tar.gz \
+        --with-jaxp-src-zip=${srcdir}/jaxp-${_JAXP_CHANGESET}.tar.gz \
+        --with-jaxws-src-zip=${srcdir}/jaxws-${_JAXWS_CHANGESET}.tar.gz \
+        --with-jdk-src-zip=${srcdir}/jdk-${_JDK_CHANGESET}.tar.gz \
+        --with-langtools-src-zip=${srcdir}/langtools-${_LANGTOOLS_CHANGESET}.tar.gz \
         --enable-pulse-java \
         --enable-nss \
         --with-rhino \




More information about the arch-commits mailing list