Hello community, here is the log from the commit of package ca-certificates for openSUSE:Factory checked in at Tue Jun 21 09:21:37 CEST 2011.
-------- --- ca-certificates/ca-certificates.changes 2010-09-27 16:58:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/ca-certificates/ca-certificates.changes 2011-06-20 15:24:04.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jun 20 12:49:52 UTC 2011 - [email protected] + +- fix spurious rpm warning if no java exists (bnc#634793) +- move java.run to java-ca-certificates + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ca-certificates.spec ++++++ --- /var/tmp/diff_new_pack.7fTCoG/_old 2011-06-21 09:14:13.000000000 +0200 +++ /var/tmp/diff_new_pack.7fTCoG/_new 2011-06-21 09:14:13.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package ca-certificates (Version 1) +# spec file for package ca-certificates # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,7 +33,7 @@ License: GPLv2+ Group: Productivity/Networking/Security Version: 1 -Release: 8 +Release: 12 Summary: Utilities for system wide CA certificate installation Source0: update-ca-certificates Source1: update-ca-certificates.8 @@ -147,7 +147,7 @@ %dir %{_prefix}/lib/ca-certificates %dir %{_prefix}/lib/ca-certificates/update.d %dir /var/lib/ca-certificates -%{_prefix}/lib/ca-certificates/update.d/* +%{_prefix}/lib/ca-certificates/update.d/certbundle.run %{_sbindir}/update-ca-certificates %{_mandir}/man8/update-ca-certificates.8* %ghost /var/lib/ca-certificates/ca-bundle.pem @@ -157,6 +157,7 @@ %files -n java-ca-certificates %defattr(-, root, root) %dir %{_prefix}/lib/ca-certificates/java +%{_prefix}/lib/ca-certificates/update.d/java.run %{_prefix}/lib/ca-certificates/java/keystore.jar %ghost /var/lib/ca-certificates/java-cacerts %ghost /var/lib/ca-certificates/gcj-cacerts ++++++ java.run ++++++ --- /var/tmp/diff_new_pack.7fTCoG/_old 2011-06-21 09:14:13.000000000 +0200 +++ /var/tmp/diff_new_pack.7fTCoG/_new 2011-06-21 09:14:13.000000000 +0200 @@ -35,11 +35,13 @@ if [ -n "$JAVA_HOME" ]; then java="$JAVA_HOME/bin/java" else - java=`which java` -fi - -if [[ $(readlink -f "${java}") =~ gij ]]; then - java="" + java=`type -P java` + if [ -n "$java" -a -L "$java" ]; then + java=`readlink -f "$java"` + if [ "${java//gij}" != "$java" ]; then + java= + fi + fi fi if [ ! -e "$libexecdir"/keystore.jar ]; then @@ -73,7 +75,7 @@ fi done -if [ -x "$java" ]; then +if [ -n "$java" -a -x "$java" ]; then echo "creating $cafile ..." $java -jar $libexecdir/keystore.jar -keystore "$cafile" -cadir "$cadir" "$@" fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
