Hello community,
here is the log from the commit of package java-1_7_0-openjdk for
openSUSE:Factory checked in at 2014-10-02 14:13:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-bootstrap.changes
2014-09-24 13:09:36.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes
2014-10-02 14:13:29.000000000 +0200
@@ -1,0 +2,17 @@
+Mon Sep 29 08:31:47 UTC 2014 - fst...@suse.com
+
+- Do not waste time building javadoc when building bootstrap
+- Ignore ant's java-devel require - we already have
+ java-bootstrap-devel
+
+-------------------------------------------------------------------
+Mon Sep 29 06:40:39 UTC 2014 - fst...@suse.com
+
+- Reformat the spec files with newer version of spec-cleaner
+- Use more generic requires and provides:
+ * java-bootstrap and
+ * java-bootstrap-devel
+ - Allows us to use the same boostrap packages for building of
+ java-1_8_0-openjdk
+
+-------------------------------------------------------------------
java-1_7_0-openjdk.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.SAV2TA/_old 2014-10-02 14:13:32.000000000 +0200
+++ /var/tmp/diff_new_pack.SAV2TA/_new 2014-10-02 14:13:32.000000000 +0200
@@ -116,7 +116,17 @@
%global with_default_hotspot_tarball 0
%endif
%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} %{name}-devel %{name}-headless java java-devel
+BuildRequires: ecj
+%endif
Name: java-1_7_0-openjdk-bootstrap
Version: %{javaver}.%{buildver}
Release: 0
@@ -223,6 +233,7 @@
#was bnc#634793
Requires: mozilla-nss
Requires(pre): update-alternatives
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Standard JPackage base provides.
%if ! %{with bootstrap}
Provides: java = %{javaver}
@@ -230,12 +241,6 @@
Provides: java-%{javaver}-openjdk = %{version}-%{release}
Provides: java-openjdk = %{version}-%{release}
Provides: jre = %{javaver}
-%ifarch %{ix86} ppc
-Provides: jre-32 = %{javaver}
-%endif
-%ifarch x86_64
-Provides: jre-64 = %{javaver}
-%endif
Provides: jre-%{javaver} = %{version}-%{release}
Provides: jre-%{javaver}-openjdk = %{version}-%{release}
Provides: jre-openjdk = %{version}-%{release}
@@ -264,8 +269,15 @@
Provides: jre1.5.x
Provides: jre1.6.x
Provides: jre1.7.x
+%ifarch %ix86 ppc
+Provides: jre-32 = %{javaver}
+%endif
+%ifarch x86_64
+Provides: jre-64 = %{javaver}
+%endif
+%else
+Provides: java-bootstrap = %{javaver}
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Reduce build time from 27 hours to 12 hours by only running test
# suites on JIT architectures.
%ifarch %{test_arches}
@@ -287,17 +299,6 @@
%if 0%{?suse_version} >= 1220
BuildRequires: xprop
%endif
-%if %{with bootstrap}
-BuildRequires: ecj-bootstrap
-BuildRequires: java-1_5_0-gcj-compat-devel
-Conflicts: java-1_7_0-openjdk
-%define _unpackaged_files_terminate_build 0
-%else
-BuildRequires: %{name}-bootstrap >= 1.7.0
-BuildRequires: %{name}-bootstrap-devel >= 1.7.0
-#!BuildIgnore: %{name} %{name}-devel %{name}-headless java
-BuildRequires: ecj
-%endif
# Mauve build requirements.
%if %{with tests}
BuildRequires: ecj
@@ -403,6 +404,7 @@
Provides: java-sdk-%{javaver}-openjdk = %{version}
Provides: java-sdk-openjdk = %{version}
%else
+Provides: java-bootstrap-devel = %{javaver}
Conflicts: java-1_7_0-openjdk-devel
%endif
@@ -418,6 +420,8 @@
line. Except for the appletviewer, these tools do not provide a
graphical user interface.
+%if ! %{with bootstrap}
+
%package demo
Summary: Sources for building demo applications with OpenJDK 7
Group: Development/Languages/Java
@@ -466,6 +470,8 @@
Although working pretty fine, there are known issues with accessibility on, so
do not rather install this package unless you really need.
+%endif
+
%prep
%if 0%{?suse_version} >= 1230
%gpg_verify -f %{SOURCE2002} %{SOURCE2000}
@@ -522,6 +528,7 @@
--with-javac=${JAVAC} \
--with-ecj=%{_bindir}/ecj \
--with-ecj-jar=${ECJJAR} \
+ --disable-docs \
%else
--disable-bootstrap \
%endif
@@ -572,6 +579,7 @@
patch -p0 -i %{PATCH106}
patch -p0 -i %{PATCH108}
patch -p0 -i %{PATCH200}
+
%if ! %{with zero}
patch -p0 -i %{PATCH403}
%endif
@@ -595,6 +603,7 @@
%endif
patch -p1 -i %{PATCH1001}
+
%if %{with_default_hotspot_tarball}
patch -p1 -i %{PATCH10011}
%endif
@@ -606,6 +615,7 @@
if [ -f %{buildoutputdir}/j2sdk-image/jre/lib/security/cacerts ]; then
rm %{buildoutputdir}/j2sdk-image/jre/lib/security/cacerts
fi
+
%if 0%{?suse_version} < 1130
# ========== a default keystore ==========
# a cacerts generation - 11.3+ use java-ca-certificates package
@@ -641,7 +651,6 @@
echo "sun.zoneinfo.dir=%{_datadir}/javazi" >> $JAVA_HOME/jre/lib/tz.properties
%if %{with tests}
-
%check
# Run jtreg test suite.
export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -783,10 +792,14 @@
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 \
@@ -885,7 +898,6 @@
fi
%if 0%{?suse_version} >= 1130
-
%posttrans headless
# bnc#781690#c11: don't trust user defined JAVA_HOME and use the current VM
# XXX: this might conflict between various versions of openjdk
@@ -1032,6 +1044,8 @@
update-alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
fi
+%if ! %{with bootstrap}
+
%post javadoc
update-alternatives \
--install %{_javadocdir}/java javadocdir %{_javadocdir}/%{sdklnk}/api \
@@ -1052,6 +1066,8 @@
ln -sf %{_libdir}/java-atk-wrapper/java-atk-wrapper.jar
%{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar
fi
+%endif
+
%files
%defattr(0644,root,root,0755)
%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}
@@ -1101,11 +1117,13 @@
%exclude %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so
#belongs to full package
%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjsoundalsa.so
+
%if %{with_pulseaudio}
%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libicedtea-sound.so
%exclude %{_jvmdir}/%{sdkdir}/jre/lib/pulseaudio.properties
%endif
%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libsplashscreen.so
+
%ifarch %ix86
%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client/libjsig.so
@@ -1119,6 +1137,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 zero}
%ifnarch ppc64 ppc64le
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/classes.jsa
@@ -1224,6 +1243,7 @@
%{_mandir}/man1/xjc-%{sdklnk}.1*
%if ! %{with bootstrap}
+
%files demo
%defattr(0644,root,root,0755)
%{_jvmdir}/%{sdkdir}/demo
++++++ java-1_7_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.SAV2TA/_old 2014-10-02 14:13:32.000000000 +0200
+++ /var/tmp/diff_new_pack.SAV2TA/_new 2014-10-02 14:13:32.000000000 +0200
@@ -116,7 +116,17 @@
%global with_default_hotspot_tarball 0
%endif
%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} %{name}-devel %{name}-headless java java-devel
+BuildRequires: ecj
+%endif
Name: java-1_7_0-openjdk
Version: %{javaver}.%{buildver}
Release: 0
@@ -223,6 +233,7 @@
#was bnc#634793
Requires: mozilla-nss
Requires(pre): update-alternatives
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Standard JPackage base provides.
%if ! %{with bootstrap}
Provides: java = %{javaver}
@@ -230,12 +241,6 @@
Provides: java-%{javaver}-openjdk = %{version}-%{release}
Provides: java-openjdk = %{version}-%{release}
Provides: jre = %{javaver}
-%ifarch %{ix86} ppc
-Provides: jre-32 = %{javaver}
-%endif
-%ifarch x86_64
-Provides: jre-64 = %{javaver}
-%endif
Provides: jre-%{javaver} = %{version}-%{release}
Provides: jre-%{javaver}-openjdk = %{version}-%{release}
Provides: jre-openjdk = %{version}-%{release}
@@ -264,8 +269,15 @@
Provides: jre1.5.x
Provides: jre1.6.x
Provides: jre1.7.x
+%ifarch %ix86 ppc
+Provides: jre-32 = %{javaver}
+%endif
+%ifarch x86_64
+Provides: jre-64 = %{javaver}
+%endif
+%else
+Provides: java-bootstrap = %{javaver}
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Reduce build time from 27 hours to 12 hours by only running test
# suites on JIT architectures.
%ifarch %{test_arches}
@@ -287,17 +299,6 @@
%if 0%{?suse_version} >= 1220
BuildRequires: xprop
%endif
-%if %{with bootstrap}
-BuildRequires: ecj-bootstrap
-BuildRequires: java-1_5_0-gcj-compat-devel
-Conflicts: java-1_7_0-openjdk
-%define _unpackaged_files_terminate_build 0
-%else
-BuildRequires: %{name}-bootstrap >= 1.7.0
-BuildRequires: %{name}-bootstrap-devel >= 1.7.0
-#!BuildIgnore: %{name} %{name}-devel %{name}-headless java
-BuildRequires: ecj
-%endif
# Mauve build requirements.
%if %{with tests}
BuildRequires: ecj
@@ -403,6 +404,7 @@
Provides: java-sdk-%{javaver}-openjdk = %{version}
Provides: java-sdk-openjdk = %{version}
%else
+Provides: java-bootstrap-devel = %{javaver}
Conflicts: java-1_7_0-openjdk-devel
%endif
@@ -418,6 +420,8 @@
line. Except for the appletviewer, these tools do not provide a
graphical user interface.
+%if ! %{with bootstrap}
+
%package demo
Summary: Sources for building demo applications with OpenJDK 7
Group: Development/Languages/Java
@@ -466,6 +470,8 @@
Although working pretty fine, there are known issues with accessibility on, so
do not rather install this package unless you really need.
+%endif
+
%prep
%if 0%{?suse_version} >= 1230
%gpg_verify -f %{SOURCE2002} %{SOURCE2000}
@@ -522,6 +528,7 @@
--with-javac=${JAVAC} \
--with-ecj=%{_bindir}/ecj \
--with-ecj-jar=${ECJJAR} \
+ --disable-docs \
%else
--disable-bootstrap \
%endif
@@ -572,6 +579,7 @@
patch -p0 -i %{PATCH106}
patch -p0 -i %{PATCH108}
patch -p0 -i %{PATCH200}
+
%if ! %{with zero}
patch -p0 -i %{PATCH403}
%endif
@@ -595,6 +603,7 @@
%endif
patch -p1 -i %{PATCH1001}
+
%if %{with_default_hotspot_tarball}
patch -p1 -i %{PATCH10011}
%endif
@@ -606,6 +615,7 @@
if [ -f %{buildoutputdir}/j2sdk-image/jre/lib/security/cacerts ]; then
rm %{buildoutputdir}/j2sdk-image/jre/lib/security/cacerts
fi
+
%if 0%{?suse_version} < 1130
# ========== a default keystore ==========
# a cacerts generation - 11.3+ use java-ca-certificates package
@@ -641,7 +651,6 @@
echo "sun.zoneinfo.dir=%{_datadir}/javazi" >> $JAVA_HOME/jre/lib/tz.properties
%if %{with tests}
-
%check
# Run jtreg test suite.
export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -783,10 +792,14 @@
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 \
@@ -885,7 +898,6 @@
fi
%if 0%{?suse_version} >= 1130
-
%posttrans headless
# bnc#781690#c11: don't trust user defined JAVA_HOME and use the current VM
# XXX: this might conflict between various versions of openjdk
@@ -1032,6 +1044,8 @@
update-alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
fi
+%if ! %{with bootstrap}
+
%post javadoc
update-alternatives \
--install %{_javadocdir}/java javadocdir %{_javadocdir}/%{sdklnk}/api \
@@ -1052,6 +1066,8 @@
ln -sf %{_libdir}/java-atk-wrapper/java-atk-wrapper.jar
%{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar
fi
+%endif
+
%files
%defattr(0644,root,root,0755)
%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}
@@ -1101,11 +1117,13 @@
%exclude %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so
#belongs to full package
%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjsoundalsa.so
+
%if %{with_pulseaudio}
%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libicedtea-sound.so
%exclude %{_jvmdir}/%{sdkdir}/jre/lib/pulseaudio.properties
%endif
%exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libsplashscreen.so
+
%ifarch %ix86
%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client/libjsig.so
@@ -1119,6 +1137,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 zero}
%ifnarch ppc64 ppc64le
%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/classes.jsa
@@ -1224,6 +1243,7 @@
%{_mandir}/man1/xjc-%{sdklnk}.1*
%if ! %{with bootstrap}
+
%files demo
%defattr(0644,root,root,0755)
%{_jvmdir}/%{sdkdir}/demo
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
