Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2017-09-27 16:49:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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" Wed Sep 27 16:49:28 2017 rev:90 rq:527768 version:1.7.0.151 Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk.changes 2017-09-11 16:17:17.075100258 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes 2017-09-27 16:49:30.648388089 +0200 @@ -1,0 +2,23 @@ +Sat Sep 16 06:54:56 UTC 2017 - fstrba@suse.com + +- Retire the *-bootstrap package +- Make the java-1_7_0-openjdk package bootstrap with any of the + java-1_5_0-gcj-compat, java-1_6_0-openjdk and java-1_7_0-openjdk, + according to the disponibility on the system +- Don't filter out -fstack-clash-protection, since we are using the + default system GCC again. +- Added patch: + * icedtea-2.6.11-jdk6.patch + + Use the right language/target version when bootstraping with + jdk6 +- Removed patch: + * java-1_7_0-openjdk-override.patch + + Not needed anymore + +------------------------------------------------------------------- +Fri Sep 15 18:54:05 UTC 2017 - fstrba@suse.com + +- Adapt to the new layout of java-1_5_0-gcj-compat and remove some + unnecessary dependencies + +------------------------------------------------------------------- Old: ---- java-1_7_0-openjdk-bootstrap.changes java-1_7_0-openjdk-bootstrap.spec java-1_7_0-openjdk-override.patch pre_checkin.sh New: ---- icedtea-2.6.11-jdk6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.WuNGEe/_old 2017-09-27 16:49:32.492128631 +0200 +++ /var/tmp/diff_new_pack.WuNGEe/_new 2017-09-27 16:49:32.496128068 +0200 @@ -116,7 +116,12 @@ %ifarch %{test_arches} %bcond_with tests %endif -%bcond_with bootstrap +%if 0%{?suse_version} >= 1330 || 0%{?suse_version} == 1315 +%global with_sunec 1 +%else +%global with_sunec 0 +%endif +%bcond_without bootstrap %bcond_with zero # Turn on/off some features depending on openSUSE version %if 0%{?suse_version} >= 1130 && ! %{with zero} @@ -128,30 +133,6 @@ %global tapsetroot %{_datadir}/systemtap %global tapsetdir %{tapsetroot}/tapset/%{_build_cpu} %endif -%if 0%{?suse_version} >= 1330 || 0%{?suse_version} == 1315 -%if %{with bootstrap} -%global with_sunec 0 -%else -%global with_sunec 1 -%endif -%else -%global with_sunec 0 -%endif -%if %{with bootstrap} -%define _unpackaged_files_terminate_build 0 -BuildRequires: ecj-bootstrap -BuildRequires: java-1_5_0-gcj-compat-devel -Conflicts: java-1_7_0-openjdk -%else -BuildRequires: java-bootstrap >= 1.7.0 -BuildRequires: java-bootstrap-devel >= 1.7.0 -#!BuildIgnore: %{name} -#!BuildIgnore: %{name}-devel -#!BuildIgnore: %{name}-headless -#!BuildIgnore: java -#!BuildIgnore: java-devel -#!BuildIgnore: java-headless -%endif Name: java-1_7_0-openjdk Version: %{javaver}.%{buildver} Release: 0 @@ -180,7 +161,6 @@ Source2000: http://icedtea.classpath.org/download/source/icedtea-%{icedtea_version}.tar.xz.sig Source2001: http://icedtea.classpath.org/download/source/icedtea-sound-%{icedtea_sound_version}.tar.xz.sig Source2002: java-1_7_0-openjdk.keyring.renamed -Source2500: pre_checkin.sh # RPM/distribution specific patches # Remove the use of __DATE__ and __TIME__ in order to diminish unnecessary rebuilds Patch2: file-contains-date-and-time.patch @@ -217,7 +197,7 @@ Patch1004: java-1_7_0-openjdk-zero-annotate-aborting-functions-zero.patch # Avoid too much silence from javadoc Patch1005: java-1_7_0-openjdk-javadoc-verbose.patch -Patch1006: java-1_7_0-openjdk-override.patch +Patch1006: icedtea-2.6.11-jdk6.patch Patch1007: zero-atomic_copy64.patch Patch10011: openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch Patch10012: java-1_7_0-openjdk-libjvm-link.patch @@ -242,6 +222,7 @@ BuildRequires: mozilla-nss-devel BuildRequires: perl BuildRequires: procps +BuildRequires: rhino BuildRequires: unzip BuildRequires: update-desktop-files BuildRequires: wget @@ -272,11 +253,7 @@ #was bnc#634793 Requires: mozilla-nss Requires(pre): update-alternatives -%if ! %{with bootstrap} -BuildRequires: rhino -%endif # Standard JPackage base provides. -%if ! %{with bootstrap} Provides: java = %{javaver} Provides: java-%{javaver} = %{version}-%{release} Provides: java-%{javaver}-openjdk = %{version}-%{release} @@ -310,8 +287,11 @@ Provides: jre1.5.x Provides: jre1.6.x Provides: jre1.7.x +%if %{with bootstrap} +BuildRequires: java-devel +BuildConflicts: java-devel >= 1.8 %else -Provides: java-bootstrap = %{javaver} +BuildRequires: %{name}-devel %endif %if %{with_system_lcms} # since 2.4.1 release, newest lcms2 is needed @@ -338,7 +318,6 @@ %endif # Mauve build requirements. %if %{with tests} -BuildRequires: ecj BuildRequires: fontconfig BuildRequires: freetype2-devel >= 2.3.0 BuildRequires: xorg-x11-fonts @@ -391,11 +370,10 @@ %package headless Summary: OpenJDK 7 runtime environment without X, audio and video support -Group: Development/Languages/Java -Requires(pre): update-alternatives -%if ! %{with bootstrap} # Require zoneinfo data provided by tzdata-java subpackage. +Group: Development/Languages/Java Requires: tzdata-java +Requires(pre): update-alternatives Provides: java-headless = %{version}-%{release} Provides: java-openjdk-headless = %{version}-%{release} Provides: jre-%{javaver}-headless = %{version}-%{release} @@ -406,9 +384,6 @@ # from http://en.opensuse.org/openSUSE:Package_dependencies#Splitting_off_a_sub-pac... # provides a libjvm.so to ensure update is working well Provides: %{name}:%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/libjvm.so -%else -Conflicts: java-1_7_0-openjdk-headless -%endif %if %{with_system_lcms} # older lcms2 is known to have security issues, let's depends on fixed version Requires: lcms2 >= 2.5 @@ -430,7 +405,6 @@ Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} Requires(pre): %{_sbindir}/update-alternatives -%if ! %{with bootstrap} Provides: java-%{javaver}-devel = %{version} Provides: java-%{javaver}-openjdk-devel = %{version}-%{release} Provides: java-devel = %{javaver} @@ -439,10 +413,6 @@ Provides: java-sdk-%{javaver} = %{version} Provides: java-sdk-%{javaver}-openjdk = %{version} Provides: java-sdk-openjdk = %{version} -%else -Conflicts: java-1_7_0-openjdk-devel -Provides: java-bootstrap-devel = %{javaver} -%endif %description devel SUSE's implementation of the OpenJDK 7 Development Environment. @@ -456,7 +426,6 @@ for the appletviewer, these tools do not provide a graphical user interface. -%if ! %{with bootstrap} %package demo Summary: OpenJDK 7 Demos Group: Development/Languages/Java @@ -484,9 +453,6 @@ Provides: java-%{javaver}-javadoc = %{version}-%{release} Provides: java-%{javaver}-openjdk-javadoc = %{version}-%{release} Provides: java-javadoc = %{version}-%{release} -%if 0%{?suse_version} >= 1120 -BuildArch: noarch -%endif %description javadoc This package provides documentation of the API provided by OpenJDK 7 @@ -509,8 +475,6 @@ There are known issues with accessibility on, so please do not install this package unless you really need to. -%endif - %prep %setup -q -n icedtea-%{icedtea_version} -a 3 %setup -q -D -n icedtea-%{icedtea_version} -T -a 1 @@ -520,6 +484,7 @@ %patch1000 -p1 %patch1002 -p1 %patch1003 -p1 +%patch1006 -p1 %build export LANG=C @@ -535,31 +500,7 @@ export ZLIB_LIBS="-L/%{_lib} -lz" %endif -%if %{with bootstrap} -# We'll use gcj for bootstrapping. We need a javac that -# can compile language version 7. The ecj.jar used by gcj does -# support that level, but gcj doesn't allow us to set it (-fsource -# only allows up to level 6) gcj also has imcompatible options from javac -# which we could translate with a wrapper script, but then again we -# wouldn't be able to use level 7 (and the equivalent to -sourcepath -# is missing anyway). So instead write a wrapper that directly uses -# the ecj.jar file from the gcj package. It's interface is a normal -# javac one. -JAVAC=`pwd`/javacwrap -%if 0%{?suse_version} >= 1200 -ECJJAR=`gcj -print-file-name=ecj.jar` -%else -ECJJAR=%{_datadir}/java/eclipse-ecj.jar -%endif -cat <<EOF > $JAVAC -#!/bin/sh -exec gij -cp $ECJJAR org.eclipse.jdt.internal.compiler.batch.Main \${1+\$@} -EOF -chmod +x ${JAVAC} -export CC=gcc-$(gcj -dumpversion) -%endif - -export CFLAGS=$(rpm -E '%{optflags}' | sed -e 's/-Wall\>//' -e 's/-fstack-clash-protection//') +export CFLAGS=$(rpm -E '%{optflags}' | sed -e 's/-Wall\>//') export CXXFLAGS=${CFLAGS} %if %{with_sunec} export NSS_SOFTOKN_CFLAGS="`pkg-config --cflags nss` -I`pwd`" @@ -573,9 +514,6 @@ %if %{with bootstrap} --enable-bootstrap \ --enable-bootstrap-tools \ - --with-javac=${JAVAC} \ - --without-rhino \ - --disable-docs \ %else --disable-bootstrap \ %endif @@ -660,10 +598,6 @@ patch -p1 -i %{PATCH10011} patch -p0 -i %{PATCH10012} -%if %{with bootstrap} -patch -p0 -i %{PATCH1006} -%endif - make %{?_smp_mflags} export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image @@ -779,7 +713,10 @@ %if %{with_systemtap} # Install systemtap support files. - cp -a tapset %{buildroot}%{_jvmdir}/%{sdkdir} + install -dm 755 %{buildroot}%{_jvmdir}/%{sdkdir}/tapset + for i in tapset/*.stp; do + cp -a $i %{buildroot}%{_jvmdir}/%{sdkdir}/tapset/$(basename $i .stp)-%{javaver}.stp + done install -d -m 755 %{buildroot}%{tapsetdir} pushd %{buildroot}%{tapsetdir} RELATIVE=$(%{abs2rel} %{_jvmdir}/%{sdkdir}/tapset %{tapsetdir}) @@ -848,14 +785,10 @@ popd -%if ! %{with bootstrap} - # Install Javadoc documentation. install -d -m 755 %{buildroot}%{_javadocdir} cp -a %{buildoutputdir}/docs %{buildroot}%{_javadocdir}/%{sdklnk} -%endif - # Install icons and menu entries. for s in 16 24 32 48 ; do install -D -p -m 644 \ @@ -1100,7 +1033,6 @@ update-alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk} fi -%if ! %{with bootstrap} %post javadoc update-alternatives \ --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{sdklnk}/api \ @@ -1124,7 +1056,6 @@ if [ ! -e %{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar ]; then ln -sf %{_libdir}/java-atk-wrapper/java-atk-wrapper.jar %{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar fi -%endif %files %dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall} @@ -1302,7 +1233,6 @@ %{_mandir}/man1/wsimport-%{sdklnk}.1* %{_mandir}/man1/xjc-%{sdklnk}.1* -%if ! %{with bootstrap} %files demo %{_jvmdir}/%{sdkdir}/demo %{_jvmdir}/%{sdkdir}/sample @@ -1319,6 +1249,4 @@ %ghost %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so %ghost %{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar -%endif - %changelog ++++++ icedtea-2.6.11-jdk6.patch ++++++ --- icedtea-2.6.11/patches/boot/use_target_6_for_bootstrap_classes.patch 2017-08-04 20:36:09.632032776 +0200 +++ icedtea-2.6.11/patches/boot/use_target_6_for_bootstrap_classes.patch 2017-09-16 01:40:38.279694139 +0200 @@ -1,78 +1,58 @@ -diff -r 9cf5ed6b45d6 make/java/text/base/Makefile ---- openjdk-boot/jdk/make/java/text/base/Makefile Mon Jul 25 16:20:39 2011 -0700 -+++ openjdk-boot/jdk/make/java/text/base/Makefile Wed Jul 27 19:10:34 2011 +0100 -@@ -34,6 +34,9 @@ - # - include FILES_java.gmk - -+LANGUAGE_VERSION = -source 6 -+CLASS_VERSION = -target 6 -+ - # - # Include - # -diff -r 9cf5ed6b45d6 make/java/java/Makefile ---- openjdk-boot/jdk/make/java/java/Makefile Mon Jul 25 16:20:39 2011 -0700 -+++ openjdk-boot/jdk/make/java/java/Makefile Thu Jul 28 02:14:07 2011 +0100 -@@ -52,6 +52,8 @@ - OTHER_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"' +--- openjdk-boot/corba/make/common/shared/Defs-java.gmk 2017-09-15 18:11:13.354855272 +0200 ++++ openjdk-boot/corba/make/common/shared/Defs-java.gmk 2017-09-16 01:30:25.788439089 +0200 +@@ -128,12 +128,12 @@ + JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS) + + # Add the source level +-SOURCE_LANGUAGE_VERSION = 7 ++SOURCE_LANGUAGE_VERSION = 6 + LANGUAGE_VERSION = -source $(SOURCE_LANGUAGE_VERSION) + JAVACFLAGS += $(LANGUAGE_VERSION) + + # Add the class version we want +-TARGET_CLASS_VERSION = 7 ++TARGET_CLASS_VERSION = 6 + CLASS_VERSION = -target $(TARGET_CLASS_VERSION) + JAVACFLAGS += $(CLASS_VERSION) + JAVACFLAGS += -encoding ascii +--- openjdk-boot/jdk/make/common/shared/Defs-control.gmk 2017-09-15 18:11:13.598855273 +0200 ++++ openjdk-boot/jdk/make/common/shared/Defs-control.gmk 2017-09-16 01:37:51.465847643 +0200 +@@ -88,9 +88,9 @@ + dummy := $(shell $(MKDIR) -p $(TEMP_DIR)) + + # The language version we want for this jdk build +-SOURCE_LANGUAGE_VERSION=7 ++SOURCE_LANGUAGE_VERSION=6 + # The class version we want for this jdk build +-TARGET_CLASS_VERSION=7 ++TARGET_CLASS_VERSION=6 + + # The MESSAGE, WARNING and ERROR files are used to store sanity check and + # source check messages, warnings and errors. +--- openjdk-boot/jdk/make/common/shared/Defs-java.gmk 2017-09-15 18:11:13.598855273 +0200 ++++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk 2017-09-16 01:31:24.276439310 +0200 +@@ -154,12 +154,12 @@ endif -+LANGUAGE_VERSION = -source 6 -+CLASS_VERSION = -target 6 + # Add the source level +-SOURCE_LANGUAGE_VERSION = 7 ++SOURCE_LANGUAGE_VERSION = 6 + LANGUAGE_VERSION = -source $(SOURCE_LANGUAGE_VERSION) + JAVACFLAGS += $(LANGUAGE_VERSION) + + # Add the class version we want +-TARGET_CLASS_VERSION = 7 ++TARGET_CLASS_VERSION = 6 + CLASS_VERSION = -target $(TARGET_CLASS_VERSION) + JAVACFLAGS += $(CLASS_VERSION) + JAVACFLAGS += -encoding ascii +--- openjdk-boot/jdk/make/java/invoke/Makefile 2017-09-15 18:11:13.598855273 +0200 ++++ openjdk-boot/jdk/make/java/invoke/Makefile 2017-09-16 01:38:54.945847883 +0200 +@@ -36,7 +36,5 @@ + + # The sources built here use new language syntax to generate + # method handle calls. Let's be sure we are using that format. +-LANGUAGE_VERSION = -source 7 +-CLASS_VERSION = -target 7 - # - # Files to compile. -diff -r 9cf5ed6b45d6 make/sun/rmi/rmi/Makefile ---- openjdk-boot/jdk/make/sun/rmi/rmi/Makefile Mon Jul 25 16:20:39 2011 -0700 -+++ openjdk-boot/jdk/make/sun/rmi/rmi/Makefile Thu Jul 28 03:12:35 2011 +0100 -@@ -34,6 +32,10 @@ - PRODUCT = sun - include $(BUILDDIR)/common/Defs.gmk - -+LANGUAGE_VERSION = -source 6 -+CLASS_VERSION = -target 6 -+ -+ - # - # Java files to compile. - # -diff -r 9cf5ed6b45d6 make/com/sun/jndi/rmi/registry/Makefile ---- openjdk-boot/jdk/make/com/sun/jndi/rmi/registry/Makefile Mon Jul 25 16:20:39 2011 -0700 -+++ openjdk-boot/jdk/make/com/sun/jndi/rmi/registry/Makefile Thu Jul 28 04:26:24 2011 +0100 -@@ -32,6 +32,9 @@ - PRODUCT = sun - include $(BUILDDIR)/common/Defs.gmk - -+LANGUAGE_VERSION = -source 6 -+CLASS_VERSION = -target 6 -+ - # - # Files to compile - # -diff -r 9cf5ed6b45d6 make/com/sun/jndi/cosnaming/Makefile ---- openjdk-boot/jdk/make/com/sun/jndi/cosnaming/Makefile Mon Jul 25 16:20:39 2011 -0700 -+++ openjdk-boot/jdk/make/com/sun/jndi/cosnaming/Makefile Thu Jul 28 05:50:27 2011 +0100 -@@ -32,6 +32,9 @@ - PRODUCT = sun - include $(BUILDDIR)/common/Defs.gmk - -+LANGUAGE_VERSION = -source 6 -+CLASS_VERSION = -target 6 -+ - # - # Resources - # -diff --git a/make/sun/security/action/Makefile b/make/sun/security/action/Makefile ---- openjdk-boot/jdk/make/sun/security/action/Makefile -+++ openjdk-boot/jdk/make/sun/security/action/Makefile -@@ -28,6 +28,9 @@ - PRODUCT = sun - include $(BUILDDIR)/common/Defs.gmk - -+LANGUAGE_VERSION = -source 6 -+CLASS_VERSION = -target 6 -+ - # - # Files - # + include $(BUILDDIR)/common/Classes.gmk