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 2013-06-06 14:58:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-04-26 12:37:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes 2013-06-06 14:58:17.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Jun 5 08:16:12 UTC 2013 - mvyskocil@suse.com + +- fix bnc#781690c#11 - setup JAVA_HOME in posttrans, so certificates + will be created by this JVM +- fix the postrans conditions (add missing prefiX) +- relax build requires, so every java-devel >= 1.7.0 can match + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.UFWOAS/_old 2013-06-06 14:58:19.000000000 +0200 +++ /var/tmp/diff_new_pack.UFWOAS/_new 2013-06-06 14:58:19.000000000 +0200 @@ -264,8 +264,8 @@ #!BuildIgnore: xerces-j2 xml-commons-resolver xml-commons-apis xml-commons BuildRequires: ant BuildRequires: ant-nodeps -BuildRequires: java-1_7_0-%{origin} -BuildRequires: java-1_7_0-%{origin}-devel +BuildRequires: java >= 1.7.0 +BuildRequires: java-devel >= 1.7.0 BuildRequires: mozilla-nss-devel BuildRequires: zlib-devel # can be disabled using --disable-compile-against-syscalls @@ -847,9 +847,13 @@ %if 0%{?suse_version} >= 1130 %posttrans +# bnc#781690#c11: don't trust user defined JAVA_HOME and use the current VM +# XXX: this might conflict between various versions of openjdk +export JAVA_HOME=%{_jvmdir}/%{jrelnk} + # check if the java-cacerts is a valid keystore (bnc#781690) -if [ "`/usr/bin/file --mime-type -b %{javacacerts}`" \ - != "xapplication/x-java-keystore;" ]; then +if [ X"`/usr/bin/file --mime-type -b %{javacacerts}`" \ + != "Xapplication/x-java-keystore;" ]; then /usr/sbin/update-ca-certificates fi @@ -860,8 +864,8 @@ # if cacerts does exists, neither does not contain/point to a # valid keystore (bnc#781690) ... -if [ "`/usr/bin/file --mime-type -b -L %{cacerts}`" \ - != "xapplication/x-java-keystore;" ]; then +if [ X"`/usr/bin/file --mime-type -b -L %{cacerts}`" \ + != "Xapplication/x-java-keystore;" ]; then # bnc#727223 rm -f %{cacerts} ln -s %{javacacerts} %{cacerts} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de