Hello community, here is the log from the commit of package update-alternatives for openSUSE:11.4 checked in at Fri Feb 18 14:15:50 CET 2011. -------- --- old-versions/11.4/all/update-alternatives/update-alternatives.changes 2008-07-21 16:25:46.000000000 +0200 +++ /mounts/work_src_done/11.4/update-alternatives/update-alternatives.changes 2011-02-17 16:18:56.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 17 15:18:25 UTC 2011 - mvyskocil@suse.cz + +- fix bnc#669716 - update-alternatives corrupt + the pack/unpack removal code broke the java update-alternatives file + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- update-alternatives-669716.script ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ update-alternatives.spec ++++++ --- /var/tmp/diff_new_pack.cVzyGx/_old 2011-02-18 14:15:49.000000000 +0100 +++ /var/tmp/diff_new_pack.cVzyGx/_new 2011-02-18 14:15:49.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package update-alternatives (Version 1.14.19) +# spec file for package update-alternatives # -# Copyright (c) 2009 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 @@ -23,11 +23,12 @@ Url: http://alternatives.sourceforge.net/ %define jpackage-section free Version: 1.14.19 -Release: 22 +Release: 30.<RELEASE2> Summary: Maintain symbolic links determining default commands -License: GPL v2 or later +License: GPLv2+ Group: System/Management Source0: %{_name}-%{version}.tar.bz2 +Source1: update-alternatives-669716.script Patch0: %{_name}-suse.patch Patch1: %{_name}-suse-man.patch Patch2: %{_name}-manual-state.patch @@ -35,6 +36,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: no Requires: /usr/bin/perl +Requires(post): sed +Requires(post): coreutils %description update-alternatives creates, removes, maintains and displays @@ -70,9 +73,15 @@ install -d -m 755 $RPM_BUILD_ROOT/etc/alternatives install -d -m 755 $RPM_BUILD_ROOT/var/lib/rpm/alternatives +install -d -m 0755 %{buildroot}/%{_libexecdir}/%{name}/ +install -m 0755 %{SOURCE1} %{buildroot}/%{_libexecdir}/%{name}/javafix + %clean rm -rf $RPM_BUILD_ROOT +%post +/bin/sh %{_libexecdir}/%{name}/javafix + %files %defattr(-,root,root,-) %{_sysconfdir}/alternatives @@ -81,5 +90,6 @@ # Paths hardcoded in script and patch0. /etc/alternatives /var/lib/rpm/alternatives +%{_libexecdir}/%{name}/ %changelog ++++++ update-alternatives-669716.script ++++++ #!/bin/sh # The fix for https://bugzilla.novell.com/show_bug.cgi?id=669716 # # The change needed for update-alternatives update # https://bugzilla.novell.com/show_bug.cgi?id=648260 broke the # /var/lib/rpm/alternatives/java for Sun Java under some circumstances ALT=/var/lib/rpm/alternatives/java if [ -f $ALT ]; then TEMPFILE=`/bin/mktemp java.alternatives.XXXXXXX` /bin/cp $ALT $TEMPFILE /usr/bin/sed '/.*sun.*/,/^$/ {/^$/d}' $TEMPFILE | sed '/.*sun.*/,/^$/ {/^$/d}; $a ' > $ALT /bin/rm $TEMPFILE fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org