Mailinglist Archive: opensuse-commit (1093 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package pdksh for openSUSE:Factory
checked in at Sun Mar 7 10:58:56 CET 2010.



--------
--- pdksh/pdksh.changes 2009-12-02 19:56:35.000000000 +0100
+++ /mounts/work_src_done/STABLE/pdksh/pdksh.changes    2010-03-05 
21:34:18.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Mar  1 23:13:30 UTC 2010 - guido+opensuse.org@xxxxxxxxxxxxxxxx
+
+- use update-alternatives
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pdksh.spec ++++++
--- /var/tmp/diff_new_pack.xHumO1/_old  2010-03-07 10:58:51.000000000 +0100
+++ /var/tmp/diff_new_pack.xHumO1/_new  2010-03-07 10:58:51.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package pdksh (Version 5.2.14)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -22,10 +22,11 @@
 Url:            http://www.cs.mun.ca/~michael/pdksh/
 License:        GPLv2+ ; Public Domain, Freeware
 Group:          System/Shells
-PreReq:         /bin/ln /etc/bash.bashrc
+BuildRequires:  update-alternatives
+PreReq:         /bin/ln /etc/bash.bashrc update-alternatives
 AutoReqProv:    on
 Version:        5.2.14
-Release:        927
+Release:        928
 Summary:        Public Domain Korn Shell
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         pdksh-5.2.14.tar.gz
@@ -58,17 +59,20 @@
 mv $RPM_BUILD_ROOT/bin/ksh $RPM_BUILD_ROOT/bin/pdksh
 mv $RPM_BUILD_ROOT%{_mandir}/man1/ksh.1 $RPM_BUILD_ROOT%{_mandir}/man1/pdksh.1
 mkdir -p $RPM_BUILD_ROOT/usr/bin
-ln -sf /bin/true $RPM_BUILD_ROOT/bin/ksh
-ln -sf /bin/true $RPM_BUILD_ROOT/usr/bin/ksh
 ln -sf /bin/pdksh $RPM_BUILD_ROOT/usr/bin/pdksh
+# create ghost files
+touch $RPM_BUILD_ROOT/bin/ksh $RPM_BUILD_ROOT/%{_bindir}/ksh \
+    $RPM_BUILD_ROOT/%{_mandir}/man1/ksh.1.gz
 
 %post
 test -e etc/bash.bashrc && ln -sf bash.bashrc etc/ksh.kshrc || true
-if test -x bin/pdksh ; then
-    rm -f bin/ksh
-    ln -sf /bin/pdksh bin/ksh
-    rm -f usr/bin/ksh
-    ln -sf /bin/pdksh usr/bin/ksh
+/usr/sbin/update-alternatives --install /bin/ksh ksh /bin/pdksh 15 \
+  --slave /usr/bin/ksh usr-bin-ksh /bin/pdksh \
+  --slave %{_mandir}/man1/ksh.1.gz ksh.1.gz %{_mandir}/man1/pdksh.1.gz
+
+%preun
+if [ $1 -eq 0 ]; then
+    /usr/sbin/update-alternatives --remove ksh /bin/pdksh
 fi
 
 %postun
@@ -76,17 +80,17 @@
     if test ! -x %{_lib}/ast/ksh ; then
        rm -f etc/ksh.kshrc
     fi
-    if test ! -e bin/ksh ; then
-       rm -f bin/ksh usr/bin/ksh
-    fi
 fi
 
 %files
 %defattr(-,root,root)
 %doc BUG-REPORTS  NEWS  NOTES  PROJECTS  README
 /bin/pdksh
-%ghost %verify(not link) /bin/ksh
-%ghost %verify(not link) /usr/bin/ksh
+#%%if %{suse_version} >= 1120
+%ghost /bin/ksh
+%ghost %{_bindir}/ksh
+%ghost %{_mandir}/man1/ksh.1.gz
+#%%endif
 /usr/bin/pdksh
 %doc %{_mandir}/man1/pdksh.1.gz
 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx