commit java-1_7_0-openjdk for openSUSE:Factory
Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2017-07-30 11:21:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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" Sun Jul 30 11:21:53 2017 rev:86 rq:510332 version:1.7.0.141 Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk-bootstrap.changes 2017-05-31 13:31:39.528151498 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes 2017-07-30 11:21:54.387735350 +0200 @@ -1,0 +2,5 @@ +Fri Jul 7 14:05:16 UTC 2017 - fstrba@suse.com + +- Disable rhino in bootstrap build. Should fix build cycle. + +------------------------------------------------------------------- java-1_7_0-openjdk.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.ZYIJ6e/_old 2017-07-30 11:21:56.683411681 +0200 +++ /var/tmp/diff_new_pack.ZYIJ6e/_new 2017-07-30 11:21:56.687411117 +0200 @@ -143,10 +143,14 @@ BuildRequires: java-1_5_0-gcj-compat-devel Conflicts: java-1_7_0-openjdk %else -#!BuildIgnore: %{name} %{name}-devel %{name}-headless java java-devel BuildRequires: ecj 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 %endif Name: java-1_7_0-openjdk-bootstrap Version: %{javaver}.%{buildver} @@ -215,10 +219,6 @@ Patch10011: openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch Patch10012: java-1_7_0-openjdk-libjvm-link.patch BuildRequires: alsa-lib-devel -#BuildRequires: xalan-j2 -# make sure to use bootstrap requires of ant -#BuildRequires: xerces-j2-bootstrap -#!BuildIgnore: xerces-j2 xml-commons-resolver xml-commons-apis xml-commons BuildRequires: ant BuildRequires: autoconf BuildRequires: automake @@ -239,11 +239,8 @@ BuildRequires: mozilla-nss-devel BuildRequires: perl BuildRequires: procps -BuildRequires: rhino BuildRequires: unzip BuildRequires: update-desktop-files -# ignore depenencies of rhino to prevent a build cycle -#!BuildIgnore: bea-stax-api jline xmlbeans xmlbeans-mini BuildRequires: wget BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel @@ -251,6 +248,18 @@ BuildRequires: xz BuildRequires: zip BuildRequires: zlib-devel +# ignore depenencies of rhino to prevent a build cycle +#!BuildIgnore: bea-stax-api +#!BuildIgnore: jline +#BuildRequires: xalan-j2 +# make sure to use bootstrap requires of ant +#BuildRequires: xerces-j2-bootstrap +#!BuildIgnore: xerces-j2 +#!BuildIgnore: xml-commons +#!BuildIgnore: xml-commons-apis +#!BuildIgnore: xml-commons-resolver +#!BuildIgnore: xmlbeans +#!BuildIgnore: xmlbeans-mini #require headless subvariant Requires: %{name}-headless = %{version}-%{release} # mozilla-nss has to be installed to prevent @@ -260,7 +269,9 @@ #was bnc#634793 Requires: mozilla-nss Requires(pre): update-alternatives -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if ! %{with bootstrap} +BuildRequires: rhino +%endif # Standard JPackage base provides. %if ! %{with bootstrap} Provides: java = %{javaver} @@ -560,6 +571,7 @@ --enable-bootstrap \ --enable-bootstrap-tools \ --with-javac=${JAVAC} \ + --without-rhino \ --disable-docs \ %else --disable-bootstrap \ @@ -1105,7 +1117,6 @@ %endif %files -%defattr(0644,root,root,0755) %dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall} %dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjsoundalsa.so @@ -1118,7 +1129,6 @@ %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjavagtk.so %files headless -%defattr(0644,root,root,0755) %doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE %doc %{buildoutputdir}/j2sdk-image/jre/THIRD_PARTY_README @@ -1230,7 +1240,6 @@ %{_mandir}/man1/tnameserv-%{sdklnk}.1* %files devel -%defattr(0644,root,root,0755) %dir %{_jvmdir}/%{sdkdir} %dir %{_jvmdir}/%{sdkdir}/bin @@ -1285,21 +1294,17 @@ %if ! %{with bootstrap} %files demo -%defattr(0644,root,root,0755) %{_jvmdir}/%{sdkdir}/demo %{_jvmdir}/%{sdkdir}/sample %files src -%defattr(0644,root,root,0755) %{_jvmdir}/%{sdkdir}/src.zip %files javadoc -%defattr(0644,root,root,0755) %dir %{_javadocdir}/%{sdklnk} %{_javadocdir}/%{sdklnk}/* %files accessibility -%defattr(-,root,root,0755) %config(noreplace) %{_jvmdir}/%{jredir}/lib/accessibility.properties %ghost %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so %ghost %{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.ZYIJ6e/_old 2017-07-30 11:21:56.747402658 +0200 +++ /var/tmp/diff_new_pack.ZYIJ6e/_new 2017-07-30 11:21:56.751402095 +0200 @@ -143,10 +143,14 @@ BuildRequires: java-1_5_0-gcj-compat-devel Conflicts: java-1_7_0-openjdk %else -#!BuildIgnore: %{name} %{name}-devel %{name}-headless java java-devel BuildRequires: ecj 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 %endif Name: java-1_7_0-openjdk Version: %{javaver}.%{buildver} @@ -215,10 +219,6 @@ Patch10011: openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch Patch10012: java-1_7_0-openjdk-libjvm-link.patch BuildRequires: alsa-lib-devel -#BuildRequires: xalan-j2 -# make sure to use bootstrap requires of ant -#BuildRequires: xerces-j2-bootstrap -#!BuildIgnore: xerces-j2 xml-commons-resolver xml-commons-apis xml-commons BuildRequires: ant BuildRequires: autoconf BuildRequires: automake @@ -239,11 +239,8 @@ BuildRequires: mozilla-nss-devel BuildRequires: perl BuildRequires: procps -BuildRequires: rhino BuildRequires: unzip BuildRequires: update-desktop-files -# ignore depenencies of rhino to prevent a build cycle -#!BuildIgnore: bea-stax-api jline xmlbeans xmlbeans-mini BuildRequires: wget BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel @@ -251,6 +248,18 @@ BuildRequires: xz BuildRequires: zip BuildRequires: zlib-devel +# ignore depenencies of rhino to prevent a build cycle +#!BuildIgnore: bea-stax-api +#!BuildIgnore: jline +#BuildRequires: xalan-j2 +# make sure to use bootstrap requires of ant +#BuildRequires: xerces-j2-bootstrap +#!BuildIgnore: xerces-j2 +#!BuildIgnore: xml-commons +#!BuildIgnore: xml-commons-apis +#!BuildIgnore: xml-commons-resolver +#!BuildIgnore: xmlbeans +#!BuildIgnore: xmlbeans-mini #require headless subvariant Requires: %{name}-headless = %{version}-%{release} # mozilla-nss has to be installed to prevent @@ -260,7 +269,9 @@ #was bnc#634793 Requires: mozilla-nss Requires(pre): update-alternatives -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if ! %{with bootstrap} +BuildRequires: rhino +%endif # Standard JPackage base provides. %if ! %{with bootstrap} Provides: java = %{javaver} @@ -560,6 +571,7 @@ --enable-bootstrap \ --enable-bootstrap-tools \ --with-javac=${JAVAC} \ + --without-rhino \ --disable-docs \ %else --disable-bootstrap \ @@ -1105,7 +1117,6 @@ %endif %files -%defattr(0644,root,root,0755) %dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall} %dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjsoundalsa.so @@ -1118,7 +1129,6 @@ %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjavagtk.so %files headless -%defattr(0644,root,root,0755) %doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE %doc %{buildoutputdir}/j2sdk-image/jre/THIRD_PARTY_README @@ -1230,7 +1240,6 @@ %{_mandir}/man1/tnameserv-%{sdklnk}.1* %files devel -%defattr(0644,root,root,0755) %dir %{_jvmdir}/%{sdkdir} %dir %{_jvmdir}/%{sdkdir}/bin @@ -1285,21 +1294,17 @@ %if ! %{with bootstrap} %files demo -%defattr(0644,root,root,0755) %{_jvmdir}/%{sdkdir}/demo %{_jvmdir}/%{sdkdir}/sample %files src -%defattr(0644,root,root,0755) %{_jvmdir}/%{sdkdir}/src.zip %files javadoc -%defattr(0644,root,root,0755) %dir %{_javadocdir}/%{sdklnk} %{_javadocdir}/%{sdklnk}/* %files accessibility -%defattr(-,root,root,0755) %config(noreplace) %{_jvmdir}/%{jredir}/lib/accessibility.properties %ghost %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so %ghost %{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar
participants (1)
-
root@hilbert.suse.de