Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2014-06-30 21:43:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-06-25 06:58:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes 2014-06-30 21:43:23.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Jun 24 08:20:39 UTC 2014 - fstrba@suse.com + +- Remove the jamvm virtual machine that is used on armv6l and use + the zero port instead. Remove some conditionals that are not true + after this change. +- Remove the use of %origin variable since it is the same for + every architecture now. +- Remove --with-arm32-jit that does not work any more. +- Bootstrap build on arm32, since previous compiler cannot cope with + this version. + +------------------------------------------------------------------- Old: ---- jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.yGWcWz/_old 2014-06-30 21:43:25.000000000 +0200 +++ /var/tmp/diff_new_pack.yGWcWz/_new 2014-06-30 21:43:25.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package java-1_7_0 +# spec file for package java-1_7_0-openjdk # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,19 +16,23 @@ # +%{!?aarch64:%global aarch64 aarch64 arm64 armv8} +%global jit_arches %{ix86} x86_64 aarch64 ppc64 ppc64le +%global test_arches %{ix86} x86_64 ppc64 ppc64le + # Because of a change in architecture directories from ppc64le to ppc64, -# bootstrap is needed on ppc64le architecture. Add your architecture to the -# condition if you need to be building with bootstrap. -%ifarch ppc64le +# bootstrap is needed on ppc64le architecture. We are requiring bootstrap +# currently for % {arm}, since the old version had errors compiling some +# java files of this one. All this changes can be removed once the +# repositories settled on the new version. +# Add your architecture to the condition if you need to be building with +# bootstrap. +%ifarch ppc64le %{arm} %global _with_bootstrap 1 %endif # or use osc build --with bootstrap %bcond_with bootstrap -%{!?aarch64:%global aarch64 aarch64 arm64 armv8} -%global jit_arches %{ix86} x86_64 aarch64 ppc64 ppc64le -%global test_arches %{ix86} x86_64 ppc64 ppc64le - # Turn on/off some features depending on openSUSE version %ifarch %{jit_arches} @@ -41,18 +45,10 @@ %global with_systemtap 0 %endif -%ifarch %arm -%bcond_without jamvm -%else -%bcond_with jamvm -%endif - -# turn zero on non jit arches by default, unless jamvm has been specified +# turn zero on non jit arches by default %ifnarch %{jit_arches} -%if ! %{with jamvm} %global _with_zero --with-zero %endif -%endif %bcond_with zero %if 0%{?suse_version} >= 1220 @@ -108,19 +104,14 @@ %global abs2rel %{__perl} -e %{script} # Standard JPackage naming and versioning defines. -%if ! %{with jamvm} -%global origin openjdk -%else -%global origin icedtea -%endif %global priority 17147 %global javaver 1.7.0 %global buildver 60 # Standard JPackage directories and symbolic links. -%global sdklnk java-%{javaver}-%{origin} +%global sdklnk java-%{javaver}-openjdk %global archname %{sdklnk} -%global jrelnk jre-%{javaver}-%{origin} +%global jrelnk jre-%{javaver}-openjdk %global sdkdir %{sdklnk}-%{javaver} %global jredir %{sdkdir}/jre %global sdkbindir %{_jvmdir}/%{sdklnk}/bin @@ -152,7 +143,7 @@ # real file made by update-ca-certificates %global javacacerts %{_var}/lib/ca-certificates/java-cacerts -Name: java-1_7_0-%{origin} +Name: java-1_7_0-openjdk Version: %{javaver}.%{buildver} Release: 0 Summary: Java runtime environment based on OpenJDK 7 and IcedTea 7 @@ -178,7 +169,6 @@ %else Source11: http://icedtea.classpath.org/download/drops/icedtea7/2.5/hotspot.tar.bz2 %endif -Source13: http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5... #Source1000: java-1_7_0-openjdk-rpmlintrc # those properties are for opeSUSE only @@ -259,9 +249,6 @@ BuildRequires: liblcms2-devel >= 2.5 %endif BuildRequires: libpng-devel -%if %{with jamvm} -BuildRequires: libtool -%endif %if 0%{?suse_version} >= 1220 BuildRequires: libxslt-tools %endif @@ -368,12 +355,12 @@ # Standard JPackage base provides. Provides: java = %{javaver} Provides: java-%{javaver} = %{version}-%{release} -Provides: java-%{javaver}-%{origin} = %{version}-%{release} -Provides: java-%{origin} = %{version}-%{release} +Provides: java-%{javaver}-openjdk = %{version}-%{release} +Provides: java-openjdk = %{version}-%{release} Provides: jre = %{javaver} Provides: jre-%{javaver} = %{version}-%{release} -Provides: jre-%{javaver}-%{origin} = %{version}-%{release} -Provides: jre-%{origin} = %{version}-%{release} +Provides: jre-%{javaver}-openjdk = %{version}-%{release} +Provides: jre-openjdk = %{version}-%{release} # Standard JPackage extensions provides. Provides: jaas = %{version} Provides: java-sasl = %{version} @@ -405,11 +392,11 @@ %endif Provides: java-%{bits} = %{javaver} Provides: java-%{javaver}-%{bits} -Provides: java-%{origin}-%{bits} = %{version}-%{release} +Provides: java-openjdk-%{bits} = %{version}-%{release} Provides: jre-%{bits} = %{javaver} Provides: jre-%{javaver}-%{bits} -Provides: jre-%{javaver}-%{origin}-%{bits} = %{version}-%{release} -Provides: jre-%{origin}-%{bits} = %{version}-%{release} +Provides: jre-%{javaver}-openjdk-%{bits} = %{version}-%{release} +Provides: jre-openjdk-%{bits} = %{version}-%{release} %description This Java 7 compatible Java Runtime Environment is based on OpenJDK 7 @@ -433,12 +420,12 @@ Requires: tzdata-java Requires(pre): update-alternatives -Provides: java-%{origin}-headless = %{version}-%{release} Provides: java-headless = %{version}-%{release} -Provides: jre-%{javaver}-%{origin}-headless = %{version}-%{release} +Provides: java-openjdk-headless = %{version}-%{release} Provides: jre-%{javaver}-headless = %{version}-%{release} -Provides: jre-%{origin}-headless = %{version}-%{release} +Provides: jre-%{javaver}-openjdk-headless = %{version}-%{release} Provides: jre-headless = %{version}-%{release} +Provides: jre-openjdk-headless = %{version}-%{release} #FIXME: add extensions provides? Would not it be better to require full JRE? # from http://en.opensuse.org/openSUSE:Package_dependencies#Splitting_off_a_sub-pac... @@ -461,14 +448,14 @@ Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} Requires(pre): %{_sbindir}/update-alternatives -Provides: java-%{javaver}-%{origin}-devel = %{version}-%{release} Provides: java-%{javaver}-devel = %{version} +Provides: java-%{javaver}-openjdk-devel = %{version}-%{release} Provides: java-devel = %{javaver} -Provides: java-devel-%{origin} = %{version} +Provides: java-devel-openjdk = %{version} Provides: java-sdk = %{javaver} Provides: java-sdk-%{javaver} = %{version} -Provides: java-sdk-%{javaver}-%{origin} = %{version} -Provides: java-sdk-%{origin} = %{version} +Provides: java-sdk-%{javaver}-openjdk = %{version} +Provides: java-sdk-openjdk = %{version} %description devel This Java 7 compatible Java SDK is based on OpenJDK 6 and IcedTea 6. @@ -487,7 +474,7 @@ %package demo Summary: Sources for building demo applications with OpenJDK 7 Group: Development/Languages/Java -Provides: java-%{javaver}-%{origin}-demo = %{version}-%{release} +Provides: java-%{javaver}-openjdk-demo = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} %description demo @@ -509,8 +496,8 @@ Summary: Documentation of the Java API of OpenJDK 7 Group: Development/Languages/Java Requires(pre): %{_sbindir}/update-alternatives -Provides: java-%{javaver}-%{origin}-javadoc = %{version}-%{release} Provides: java-%{javaver}-javadoc = %{version}-%{release} +Provides: java-%{javaver}-openjdk-javadoc = %{version}-%{release} Provides: java-javadoc = %{version}-%{release} %description javadoc @@ -537,11 +524,6 @@ %gpg_verify -f %{SOURCE2001} %{SOURCE2000} %endif -%if %{with jamvm} && %{with zero} -echo "ERROR: use either --with jamvm or --with zero, both are not supported!" >&2 -exit 1 -%endif - %setup -q -n icedtea-%{icedtea_version} -a 3 cp %{SOURCE4} . @@ -608,11 +590,6 @@ %if %{with zero} --enable-zero \ %endif -%if %{with jamvm} - --enable-jamvm \ - --with-jamvm-src-zip=%{SOURCE13} \ -%endif - --enable-arm32-jit \ %if 0%{?suse_version} <= 1110 --disable-system-gio \ %endif @@ -916,10 +893,10 @@ %{_jvmdir}/%{sdkdir}/jre/lib/desktop/policytool.desktop update-alternatives \ - --install %{_jvmdir}/jre-%{origin} \ - jre_%{origin} %{_jvmdir}/%{jrelnk} %{priority} \ - --slave %{_jvmjardir}/jre-%{origin} \ - jre_%{origin}_exports %{_jvmjardir}/%{jrelnk} + --install %{_jvmdir}/jre-openjdk \ + jre_openjdk %{_jvmdir}/%{jrelnk} %{priority} \ + --slave %{_jvmjardir}/jre-openjdk \ + jre_openjdk_exports %{_jvmjardir}/%{jrelnk} update-alternatives \ --install %{_jvmdir}/jre-%{javaver} \ jre_%{javaver} %{_jvmdir}/%{jrelnk} %{priority} \ @@ -934,7 +911,7 @@ echo '-1' > /proc/sys/fs/binfmt_misc/jarexec fi update-alternatives --remove java %{jrebindir}/java - update-alternatives --remove jre_%{origin} %{_jvmdir}/%{jrelnk} + update-alternatives --remove jre_openjdk %{_jvmdir}/%{jrelnk} update-alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk} fi @@ -1067,10 +1044,10 @@ %{_jvmdir}/%{sdkdir}/jre/lib/desktop/jconsole.desktop update-alternatives \ - --install %{_jvmdir}/java-%{origin} \ - java_sdk_%{origin} %{_jvmdir}/%{sdklnk} %{priority} \ - --slave %{_jvmjardir}/java-%{origin} \ - java_sdk_%{origin}_exports %{jvmjarlink} + --install %{_jvmdir}/java-openjdk \ + java_sdk_openjdk %{_jvmdir}/%{sdklnk} %{priority} \ + --slave %{_jvmjardir}/java-openjdk \ + java_sdk_openjdk_exports %{jvmjarlink} update-alternatives \ --install %{_jvmdir}/java-%{javaver} \ java_sdk_%{javaver} %{_jvmdir}/%{sdklnk} %{priority} \ @@ -1081,7 +1058,7 @@ if [ $1 -eq 0 ] then update-alternatives --remove javac %{sdkbindir}/javac - update-alternatives --remove java_sdk_%{origin} %{_jvmdir}/%{sdklnk} + update-alternatives --remove java_sdk_openjdk %{_jvmdir}/%{sdklnk} update-alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk} fi @@ -1126,7 +1103,7 @@ %{_jvmdir}/%{sdkdir}/jre/lib/desktop/policytool.desktop %{_datadir}/icons/hicolor/*/apps/java.png -%{_jvmdir}/java-%{javaver}-%{origin} +%{_jvmdir}/java-%{javaver}-openjdk %dir %{_jvmdir}/%{sdkdir} %{_jvmdir}/%{jrelnk} @@ -1154,7 +1131,7 @@ #belongs to full package %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjsoundalsa.so %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libsplashscreen.so -%ifarch %{ix86} %{arm} +%ifarch %{ix86} %dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client/libjsig.so %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client/libjvm.so @@ -1167,7 +1144,7 @@ #belongs to full package %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt/libmawt.so %config(noreplace) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/jvm.cfg -%if ! %{with jamvm} && ! %{with zero} +%if ! %{with zero} %ifnarch ppc64 ppc64le %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/classes.jsa %endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org