[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD jre7-openjdk.install)
andyrtr at archlinux.org
andyrtr at archlinux.org
Fri Dec 16 14:42:37 UTC 2011
Date: Friday, December 16, 2011 @ 09:42:37
Author: andyrtr
Revision: 145073
upgpkg: java7-openjdk 7.b147_2.0-3
add some missing dependencies FS#27499; fix file backup entries; fix install msg FS#27527
Modified:
java7-openjdk/trunk/PKGBUILD
java7-openjdk/trunk/jre7-openjdk.install
----------------------+
PKGBUILD | 15 ++++++---------
jre7-openjdk.install | 2 +-
2 files changed, 7 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-12-16 12:11:13 UTC (rev 145072)
+++ PKGBUILD 2011-12-16 14:42:37 UTC (rev 145073)
@@ -20,7 +20,7 @@
_OPENJDK_CHANGESET=0a76e5390e68
pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="http://icedtea.classpath.org"
license=('custom')
@@ -92,7 +92,7 @@
unset JAVA_HOME
unset CLASSPATH
# default is to build with first found java-environment found in our repos - is jdk7-openjdk
- [ -f /etc/profile.d/jdk7.sh ] && . /etc/profile.d/jdk7.sh
+ [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh
unset MAKEFLAGS
export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
@@ -120,12 +120,9 @@
--with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \
--with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \
--enable-pulse-java \
+
# --with-rhino #--help
- #--with-jaxp-drop-zip=${srcdir}/jaxp145_01.zip \
- #--with-jaf-drop-zip=${srcdir}/jdk7-jaf-2010_08_19.zip \
- #--with-jaxws-drop-zip=${srcdir}/jdk7-jaxws2_2_4-b03-2011_05_27.zip \
-
# --enable-systemtap Enable inclusion of SystemTap trace support
# --enable-nss Enable inclusion of NSS security provider
# --with-abs-install-dir The absolute path where the j2sdk-image dir will be installed
@@ -140,7 +137,7 @@
package_jre7-openjdk() {
pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - runtime environment"
- depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst'
+ depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libcups' 'gtk2' 'lcms2' 'libpulse'
'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng' 'gsettings-desktop-schemas')
optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
'alsa-lib: for sound'
@@ -148,7 +145,7 @@
provides=('java-runtime=7')
conflicts=('java-runtime')
# replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
- backup=(etc/profile.d/jre7.sh)
+ backup=(etc/profile.d/jre.sh etc/profile.d/jre.csh)
install=jre7-openjdk.install
_jvmdir=/usr/lib/jvm/java-7-openjdk
@@ -208,7 +205,7 @@
provides=('java-environment=7')
conflicts=('java-environment')
# replaces=('openjdk6')
- backup=(etc/profile.d/jdk7.sh)
+ backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh)
_jvmdir=/usr/lib/jvm/java-7-openjdk
Modified: jre7-openjdk.install
===================================================================
--- jre7-openjdk.install 2011-12-16 12:11:13 UTC (rev 145072)
+++ jre7-openjdk.install 2011-12-16 14:42:37 UTC (rev 145073)
@@ -5,7 +5,7 @@
fi
echo "when you use a non-reparenting window manager"
echo "set _JAVA_AWT_WM_NONREPARENTING=1 in"
- echo "/etc/profile.d/jre7.sh"
+ echo "/etc/profile.d/jre.sh"
# update-desktop-database -q
}
More information about the arch-commits
mailing list