Hello community,
here is the log from the commit of package java-1_7_0-openjdk for
openSUSE:Factory checked in at 2013-08-06 07:00:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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"
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk.changes
2013-07-16 16:36:46.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes
2013-08-06 07:00:44.000000000 +0200
@@ -1,0 +2,19 @@
+Thu Aug 1 13:17:07 UTC 2013 - [email protected]
+
+- Fix a filelist to build with rpm-4.11
+
+-------------------------------------------------------------------
+Sat Jul 27 08:01:17 UTC 2013 - [email protected]
+
+- java-1.7.0-openjdk-makefiles-zero.patch: Fix missing definitions for
+ zero VM
+- java-1.7.0-openjdk-fork.patch: Apply unconditionally
+
+-------------------------------------------------------------------
+Wed Jul 10 13:54:33 UTC 2013 - [email protected]
+
+- fix gpg_verify argument (-n)
+- limit classes.jsa to openjdk builds only, zero and jamvm does not support
+ such feature
+
+-------------------------------------------------------------------
New:
----
java-1.7.0-openjdk-makefiles-zero.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.pn3072/_old 2013-08-06 07:00:46.000000000 +0200
+++ /var/tmp/diff_new_pack.pn3072/_new 2013-08-06 07:00:46.000000000 +0200
@@ -199,7 +199,8 @@
# Patches for AArch64
Patch107: java-1.7.0-openjdk-fork.patch
Patch108: java-1.7.0-openjdk-zero-arch.patch
-#Already upstream: Patch108: java-1.7.0-openjdk-aarch64.patch
+
+Patch109: java-1.7.0-openjdk-makefiles-zero.patch
#
# Optional component packages
@@ -464,7 +465,7 @@
%prep
%if 0%{?suse_version} >= 1230
-%gpg_verify -p java-1_7_0-openjdk %{SOURCE2000}
+%gpg_verify -f %{SOURCE2001} %{SOURCE2000}
%endif
%if %{with jamvm} && %{with zero}
@@ -560,12 +561,12 @@
qpatch -p0 %{PATCH106}
%endif
-%if %{suse_version} >= 1230
-# AArch64 fixes - EM_AARCH64 does work since 12.3
+# AArch64 fixes
qpatch -p1 %{PATCH107}
-%endif
qpatch -p0 %{PATCH108}
+qpatch -p0 %{PATCH109}
+
#SUSE specific fixes
qpatch -p1 %{PATCH1002}
@@ -984,19 +985,20 @@
%doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
%doc %{buildoutputdir}/j2sdk-image/jre/THIRD_PARTY_README
-%dir %{_jvmdir}/java-%{javaver}-%{origin}
+%{_jvmdir}/java-%{javaver}-%{origin}
%dir %{_jvmdir}/%{sdkdir}
%{_jvmdir}/%{jrelnk}
-%{_jvmjardir}/%{jrelnk}
-%{_jvmjardir}/%{sdkdir}/
+%{jvmjarlink}
+%{_jvmjardir}/%{sdkdir}
+%{_jvmjardir}/%{jrelnk}
%dir %{_jvmdir}/%{sdkdir}/jre/
%dir %{_jvmdir}/%{sdkdir}/jre/bin
%dir %{_jvmdir}/%{sdkdir}/jre/lib
%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}
%ifarch %{ix86}
-%dir %{_jvmdir}/%{sdkdir}/jre/lib/i386/client/Xusage.txt
+%{_jvmdir}/%{sdkdir}/jre/lib/i386/client/Xusage.txt
%endif
%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/headless
%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/jli
@@ -1008,23 +1010,25 @@
%attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/*.so
%ifarch %arm
%dir %{_jvmdir}/%{sdkdir}/jre/lib/arm/client
-%attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/arm/client/libjsig.so
+%{_jvmdir}/%{sdkdir}/jre/lib/arm/client/libjsig.so
%attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/arm/client/libjvm.so
%{_jvmdir}/%{sdkdir}/jre/lib/arm/client/Xusage.txt
%endif
%ifarch %{ix86}
%dir %{_jvmdir}/%{sdkdir}/jre/lib/i386/client
-%attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/i386/client/libjsig.so
+%{_jvmdir}/%{sdkdir}/jre/lib/i386/client/libjsig.so
%attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/i386/client/libjvm.so
%{_jvmdir}/%{sdkdir}/jre/lib/i386/client/Xusage.txt
%endif
%attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/jli/libjli.so
%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/headless/libmawt.so
%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/libjvm.*
-%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/libjsig.so
+%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/libjsig.so
%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt/libmawt.so
%config(noreplace) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/jvm.cfg
+%if ! %{with jamvm} && ! %{with zero}
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/classes.jsa
+%endif
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/Xusage.txt
%{_jvmdir}/%{sdkdir}/jre/lib/applet/
%{_jvmdir}/%{sdkdir}/jre/lib/cmm/
@@ -1051,11 +1055,11 @@
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/US_export_policy.jar
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
#bnc#637224
-%config(noreplace) %{_jvmdir}/%{jredir}/lib/fontconfig.*
+%config(noreplace) %{_jvmdir}/%{jredir}/lib/fontconfig*bfc
+%config(noreplace) %{_jvmdir}/%{jredir}/lib/fontconfig*src
%config(noreplace) %{_jvmdir}/%{jredir}/lib/*.properties
%config(noreplace) %{_jvmdir}/%{jredir}/lib/psfont.properties.ja
%config(noreplace) %{_jvmdir}/%{jredir}/lib/management/*
-%config(noreplace) %{_jvmdir}/%{jredir}/lib/images/cursors/cursors.properties
%dir %{_jvmdir}/%{sdkdir}/jre/lib/desktop/
%{_jvmdir}/%{sdkdir}/jre/lib/desktop/policytool.desktop
@@ -1087,9 +1091,6 @@
%attr(755,root,root) %{_jvmdir}/%{sdkdir}/bin/*
%{_jvmdir}/%{sdkdir}/include/*
%{_jvmdir}/%{sdkdir}/lib/*
-%{_jvmjardir}/%{sdklnk}/
-
-%{jvmjarlink}
%{_jvmdir}/%{sdkdir}/jre/lib/desktop/jconsole.desktop
@@ -1129,16 +1130,6 @@
%defattr(0644,root,root,0755)
%{_jvmdir}/%{sdkdir}/demo
%{_jvmdir}/%{sdkdir}/sample
-%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
-%attr(755,root,root) %{_jvmdir}/%{sdkdir}/demo/jvmti/gctest/lib/libgctest.so
-%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/demo/jvmti/heapTracker/lib/libheapTracker.so
-%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/demo/jvmti/heapViewer/lib/libheapViewer.so
-%attr(755,root,root) %{_jvmdir}/%{sdkdir}/demo/jvmti/hprof/lib/libhprof.so
-%attr(755,root,root) %{_jvmdir}/%{sdkdir}/demo/jvmti/minst/lib/libminst.so
-%attr(755,root,root) %{_jvmdir}/%{sdkdir}/demo/jvmti/mtrace/lib/libmtrace.so
-%attr(755,root,root)
%{_jvmdir}/%{sdkdir}/demo/jvmti/versionCheck/lib/libversionCheck.so
-%attr(755,root,root) %{_jvmdir}/%{sdkdir}/demo/jvmti/waiters/lib/libwaiters.so
-%attr(755,root,root) %{_jvmdir}/%{sdkdir}/sample/rmi/java-rmi.cgi
%files src
%defattr(0644,root,root,0755)
++++++ java-1.7.0-openjdk-makefiles-zero.patch ++++++
--- openjdk/hotspot/make/linux/makefiles/zero.make
+++ openjdk/hotspot/make/linux/makefiles/zero.make
@@ -34,3 +34,13 @@ VM_SUBDIR = server
# Make sure libffi is included
CFLAGS += $(LIBFFI_CFLAGS)
LIBS_VM += $(LIBFFI_LIBS)
+
+# Specify that the CPU is little endian, if necessary
+ifeq ($(ZERO_ENDIANNESS), little)
+ CFLAGS += -DVM_LITTLE_ENDIAN
+endif
+
+# Specify that the CPU is 64 bit, if necessary
+ifeq ($(ARCH_DATA_MODEL), 64)
+ CFLAGS += -D_LP64=1
+endif
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
