Hello community,
here is the log from the commit of package java-1_7_0-openjdk for
openSUSE:Factory checked in at 2012-09-23 21:05:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk.changes
2012-09-11 11:22:46.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes
2012-09-23 21:05:51.000000000 +0200
@@ -1,0 +2,10 @@
+Tue Sep 18 10:11:57 UTC 2012 - mvysko...@suse.com
+
+- add the optional jamvm support
+ * running build --with jamvm enables it
+- add an initial support for build of older releases
+ * make some buildrequires dependant on suse_version
+ * workaround older zlib w/o pkgconfig
+ * fix cacerts installation on pre-11.3
+
+-------------------------------------------------------------------
New:
----
icedtea-2.3.2-fix-extract-jamvm-dependency.patch
jamvm-e70f2450890b82c37422616cc85e1a23385f03cd.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.hw7ofo/_old 2012-09-23 21:05:54.000000000 +0200
+++ /var/tmp/diff_new_pack.hw7ofo/_new 2012-09-23 21:05:54.000000000 +0200
@@ -28,8 +28,13 @@
%endif
%endif
+%bcond_with jamvm
+
+# turn zero on non jit arches by default, unless jamvm has been specified
%ifnarch %{jit_arches}
-%define _with_zero 1
+%if ! %{with jamvm}
+%define _with_zero --with-zero
+%endif
%endif
%bcond_with zero
@@ -145,6 +150,7 @@
Source10:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archive/867d5041bee6.tar.gz
Source11:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot/archive/ea39d76b3bde.tar.gz
Source12:
http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot/archive/47a867dd3005.tar.gz
+Source13:
http://icedtea.classpath.org/download/drops/jamvm/jamvm-e70f2450890b82c37422616cc85e1a23385f03cd.tar.gz
#Source1000: java-1_7_0-openjdk-rpmlintrc
# those properties are for opeSUSE only
@@ -176,10 +182,6 @@
# OpenJDK specific patches
#
-# DROP: included in icedtea tarball
-# Add rhino support
-# Patch100: rhino.patch
-
# Type fixing for s390
Patch101: java-1.7.0-openjdk-bitmap.patch
Patch102: java-1.7.0-openjdk-size_t.patch
@@ -205,6 +207,9 @@
Patch1003: java-1_7_0-openjdk-add-memory-limit.patch
Patch1004: java-1_7_0-openjdk-zero-annotate-aborting-functions-zero.patch
+# PATCH-FIX-OPENSUSE: fix the dependency issues on jamvm builds
+# sent to distro-pkg-dev
+Patch1005: icedtea-2.3.2-fix-extract-jamvm-dependency.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -221,13 +226,20 @@
BuildRequires: libjpeg-devel
BuildRequires: liblcms2-devel
BuildRequires: libpng-devel
+%if %{with jamvm}
+BuildRequires: libtool
+%endif
+%if 0%{?suse_version} >= 1220
BuildRequires: libxslt-tools
+%endif
BuildRequires: rhino
BuildRequires: wget
BuildRequires: xorg-x11
BuildRequires: xorg-x11-devel
BuildRequires: xorg-x11-proto-devel
+%if 0%{?suse_version} >= 1220
BuildRequires: xprop
+%endif
#BuildRequires: xalan-j2
# make sure to use bootstrap requires of ant
#BuildRequires: xerces-j2-bootstrap
@@ -438,6 +450,10 @@
are provided by OpenJDK 7.
%prep
+%if %{with jamvm} && %{with zero}
+echo "ERROR: use either --with jamvm either--with zero, both are not
supported!" >&2
+exit 1
+%endif
%setup -q -n icedtea-%{icedtea_version}
%setup -q -n icedtea-%{icedtea_version} -T -D -a 3
%setup -q -n icedtea-%{icedtea_version} -T -D -a 1
@@ -449,6 +465,7 @@
%patch1000 -p1
%patch1003 -p1
+%patch1005 -p1
%build
export LANG=C
unset JAVA_HOME
@@ -457,6 +474,12 @@
export NUM_PROC=`/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :`
export NUM_PROC=${NUM_PROC:-1}
+# handle zlib packages without pkg-config file
+%if 0%{?suse_version} <= 1130
+export ZLIB_CFLAGS=" "
+export ZLIB_LIBS="-L/%{_lib} -lz"
+%endif
+
%{configure} \
--with-abs-install-dir=%{_jvmdir}/%{sdkdir} \
%ifnarch %{arm}
@@ -475,6 +498,13 @@
%if %{with zero}
--enable-zero \
%endif
+%if %{with jamvm}
+ --enable-jamvm \
+ --with-jamvm-src-zip=%{SOURCE13} \
+%endif
+%if 0%{?suse_version} <= 1110
+ --disable-system-gio \
+%endif
--with-openjdk-src-zip=%{SOURCE5} \
--with-corba-src-zip=%{SOURCE6} \
--with-jaxp-src-zip=%{SOURCE7} \
@@ -711,9 +741,7 @@
%fdupes -s $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir}/demo
%fdupes -s $RPM_BUILD_ROOT%{_javadocdir}/%{sdklnk}
-%if ! %{suse_version} >= 1130
-# touch %{buildroot}/%{_jvmdir}/%{jredir}/lib/security/cacerts
-# %else
+%if 0%{?suse_version} <= 1130
# bnc496378 - check the size of installed cacerts
# 32 bytes means a default empty one
if [[ $(stat -c "%s" $RPM_BUILD_ROOT/%{cacerts}) == "32" ]]; then
@@ -781,7 +809,7 @@
update-alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
fi
-%if %{suse_version} >= 1130
+%if 0%{?suse_version} >= 1130
%posttrans
# if there's no java, certificates are not generated
@@ -982,9 +1010,9 @@
%{_jvmdir}/%{sdkdir}/jre/lib/jvm.hprof.txt
%{_jvmdir}/%{sdkdir}/jre/lib/meta-index
-# % if %{suse_version} < 1130
-# % config(noreplace) %{_jvmdir}/%{jredir}/lib/security/cacerts
-# % else
+%if 0%{?suse_version} <= 1130
+%config(noreplace) %{cacerts}
+%endif
# % ghost %{_jvmdir}/%{jredir}/lib/security/cacerts
# % endif
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
++++++ icedtea-2.3.2-fix-extract-jamvm-dependency.patch ++++++
Index: icedtea-2.3.2/Makefile.am
===================================================================
--- icedtea-2.3.2.orig/Makefile.am 2012-08-31 16:12:45.117462371 +0200
+++ icedtea-2.3.2/Makefile.am 2012-09-17 16:18:09.395008229 +0200
@@ -1287,7 +1287,7 @@
clean-extract-cacao: clean-cacao
rm -f stamps/extract-cacao.stamp
-stamps/extract-jamvm.stamp:
+stamps/extract-jamvm.stamp: stamps/download-jamvm.stamp
if BUILD_JAMVM
set -e ; \
if ! test -d jamvm ; \
Index: icedtea-2.3.2/Makefile.in
===================================================================
--- icedtea-2.3.2.orig/Makefile.in 2012-08-31 21:37:17.545573948 +0200
+++ icedtea-2.3.2/Makefile.in 2012-09-17 16:18:34.155896484 +0200
@@ -1746,7 +1746,7 @@
clean-extract-cacao: clean-cacao
rm -f stamps/extract-cacao.stamp
-stamps/extract-jamvm.stamp:
+stamps/extract-jamvm.stamp: stamps/download-jamvm.stamp
@BUILD_JAMVM_TRUE@ set -e ; \
@BUILD_JAMVM_TRUE@ if ! test -d jamvm ; \
@BUILD_JAMVM_TRUE@ then \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
