Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2014-09-01 07:56:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-08-27 16:53:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes 2014-09-01 07:56:32.000000000 +0200 @@ -1,0 +2,18 @@ +Thu Aug 28 08:09:49 UTC 2014 - coolo@suse.com + +- build a bootstrap version when bootstrap conditional set and buildrequire + this in the version when bootstrap conditional is not set + +To make this work, we need in every prj with jdk a _link in jdk-bootstrap with +this content: + +<link package="java-1_7_0-openjdk" cicount="copy"> +<patches> + <topadd>%global _with_bootstrap 1</topadd> +</patches> +</link> + +This makes sure the build dependencies of jdk are clear and you don't need tricks +(other than the _link) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.NhyTmx/_old 2014-09-01 07:56:34.000000000 +0200 +++ /var/tmp/diff_new_pack.NhyTmx/_new 2014-09-01 07:56:34.000000000 +0200 @@ -115,7 +115,12 @@ %global with_default_hotspot_tarball 0 %endif %endif + +%if ! %{with bootstrap} Name: java-1_7_0-openjdk +%else +Name: java-1_7_0-openjdk-bootstrap +%endif Version: %{javaver}.%{buildver} Release: 0 Summary: Java runtime environment based on OpenJDK 7 and IcedTea 7 @@ -222,6 +227,7 @@ Requires: mozilla-nss Requires(pre): update-alternatives # Standard JPackage base provides. +%if ! %{with bootstrap} Provides: java = %{javaver} Provides: java-%{javaver} = %{version}-%{release} Provides: java-%{javaver}-openjdk = %{version}-%{release} @@ -255,6 +261,7 @@ Provides: jre1.5.x Provides: jre1.6.x Provides: jre1.7.x +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build # Reduce build time from 27 hours to 12 hours by only running test # suites on JIT architectures. @@ -281,9 +288,10 @@ BuildRequires: ecj-bootstrap BuildRequires: java-1_5_0-gcj-compat-devel %else +BuildRequires: %{name}-bootstrap >= 1.7.0 +BuildRequires: %{name}-bootstrap-devel >= 1.7.0 +#!BuildIgnore: %{name} %{name}-devel %{name}-headless BuildRequires: ecj -BuildRequires: java >= 1.7.0 -BuildRequires: java-devel >= 1.7.0 %endif # Mauve build requirements. %if %{with tests} @@ -345,6 +353,7 @@ # Require zoneinfo data provided by tzdata-java subpackage. Requires: tzdata-java Requires(pre): update-alternatives +%if ! %{with bootstrap} Provides: java-headless = %{version}-%{release} Provides: java-openjdk-headless = %{version}-%{release} Provides: jre-%{javaver}-headless = %{version}-%{release} @@ -355,6 +364,7 @@ # 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 +%endif %if %{with_system_lcms} # older lcms2 is known to have security issues, let's depends on fixed version Requires: lcms2 >= 2.5 @@ -376,6 +386,7 @@ 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} @@ -384,6 +395,7 @@ Provides: java-sdk-%{javaver} = %{version} Provides: java-sdk-%{javaver}-openjdk = %{version} Provides: java-sdk-openjdk = %{version} +%endif %description devel This Java 7 compatible Java SDK is based on OpenJDK 7 and IcedTea 7. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org