Hello community,
here is the log from the commit of package java-1_7_0-openjdk for
openSUSE:Factory checked in at 2014-07-21 10:34:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-07-18 06:39:55.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes
2014-07-21 10:34:45.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Jul 18 07:29:10 UTC 2014 - fst...@suse.com
+
+- Modify pulseaudio conditional, since the required dependencies
+ can be satisfied in SLE11 SP3
+- Modify accessibility post script to actually create the
+ corresponding symlinks
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.738JcI/_old 2014-07-21 10:34:47.000000000 +0200
+++ /var/tmp/diff_new_pack.738JcI/_new 2014-07-21 10:34:47.000000000 +0200
@@ -43,7 +43,7 @@
%endif
%bcond_with zero
-%if 0%{?suse_version} >= 1140
+%if 0%{?suse_version} >= 1110
%global with_pulseaudio 1
%else
%global with_pulseaudio 0
@@ -154,14 +154,14 @@
# FIXME: Is this applicable for 7?
Source3: mauve-%{mauvedate}.tar.gz
Source4: mauve_tests
-Source5:
http://icedtea.classpath.org/download/drops/icedtea7/2.5.1/openjdk.tar.bz2
-Source6:
http://icedtea.classpath.org/download/drops/icedtea7/2.5.1/corba.tar.bz2
-Source7:
http://icedtea.classpath.org/download/drops/icedtea7/2.5.1/jaxp.tar.bz2
-Source8:
http://icedtea.classpath.org/download/drops/icedtea7/2.5.1/jaxws.tar.bz2
-Source9:
http://icedtea.classpath.org/download/drops/icedtea7/2.5.1/jdk.tar.bz2
-Source10:
http://icedtea.classpath.org/download/drops/icedtea7/2.5.1/langtools.tar.bz2
-Source11:
http://icedtea.classpath.org/download/drops/icedtea7/2.5.1/hotspot.tar.bz2
-# wget
http://icedtea.classpath.org/download/drops/aarch64/2.5.1/hotspot.tar.bz2 -O
aarch64-hotspot.tar.bz2
+Source5:
http://icedtea.classpath.org/download/drops/icedtea7/%{icedtea_version}/openjdk.tar.bz2
+Source6:
http://icedtea.classpath.org/download/drops/icedtea7/%{icedtea_version}/corba.tar.bz2
+Source7:
http://icedtea.classpath.org/download/drops/icedtea7/%{icedtea_version}/jaxp.tar.bz2
+Source8:
http://icedtea.classpath.org/download/drops/icedtea7/%{icedtea_version}/jaxws.tar.bz2
+Source9:
http://icedtea.classpath.org/download/drops/icedtea7/%{icedtea_version}/jdk.tar.bz2
+Source10:
http://icedtea.classpath.org/download/drops/icedtea7/%{icedtea_version}/langtools.tar.bz2
+Source11:
http://icedtea.classpath.org/download/drops/icedtea7/%{icedtea_version}/hotspot.tar.bz2
+# wget
http://icedtea.classpath.org/download/drops/aarch64/%{icedtea_version}/hotspot.tar.bz2
-O aarch64-hotspot.tar.bz2
Source12: aarch64-hotspot.tar.bz2
#Source1000: java-1_7_0-openjdk-rpmlintrc
@@ -1103,16 +1103,13 @@
%post accessibility
# create links to java-atk-wrapper
-if [ $1 -eq 0 ]
-then
+if [ ! -e %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so ]; then
ln -sf %{_libdir}/java-atk-wrapper/libatk-wrapper.so.0
%{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so
+fi
+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
-%postun accessibility
-#mvyskocil no need for postun as files are marked as ghost files, so will be
removed on rpm -e
-exit 0
-
%files
%defattr(0644,root,root,0755)
%dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
