SPECS (AC-branch): rpm.spec - drop killing poldek; rel 93

[glen]

Author: glen                         Date: Mon Nov 17 21:05:43 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- drop killing poldek; rel 93

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.69 -> 1.837.2.42.2.70) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.69 SPECS/rpm.spec:1.837.2.42.2.70
--- SPECS/rpm.spec:1.837.2.42.2.69	Fri Nov  7 02:19:59 2008
+++ SPECS/rpm.spec	Mon Nov 17 22:05:37 2008
@@ -36,7 +36,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.4.9
-Release:	92
+Release:	93
 License:	LGPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
@@ -304,7 +304,6 @@
 Obsoletes:	rpm-libs
 # avoid installing with incompatible (non-tukaani) lzma
 Conflicts:	lzma < 1:4.42.0
-Requires(triggerpostun):	/sbin/pidof
 # avoid SEGV caused by mixed db versions
 Conflicts:	poldek < 0.18.1-16
 
@@ -1112,20 +1111,6 @@
 	rm -f /etc/vservers/*/apps/pkgmgmt/base/rpm/state/__*
 fi
 echo >&2 "You should rebuild your rpmdb: rpm --rebuilddb to avoid random rpmdb errors"
-# TODO: poldek should abort if it can't reopen rpmdb after rpm exec:
-#Installing set #3
-#rpmdb: Program version 4.2 doesn't match environment version
-#error: db4 error(22) from dbenv->open: Invalid argument
-#error: cannot open Packages index using db3 - Invalid argument (22)
-#error: //var/lib/rpm: open rpm database failed
-#Processing dependencies...
-#There are more than one package which provide "/bin/sh":
-# if poldek is running, kill it so it will not attempt to fill whole rpmdb
-p=$(/sbin/pidof poldek)
-if [ "$p" ]; then
-	echo >&2 "Killing poldek ($p), don't panic :)"
-	kill $p
-fi
 
 %triggerpostun lib -- db4.5 < %{reqdb_ver}
 echo >&2 "db4.5 upgrade: Removing /var/lib/rpm/__db* from older rpmdb version"
@@ -1135,11 +1120,6 @@
 	rm -f /etc/vservers/*/apps/pkgmgmt/base/rpm/state/__*
 fi
 echo >&2 "You should rebuild your rpmdb: rpm --rebuilddb to avoid random rpmdb errors"
-p=$(/sbin/pidof poldek)
-if [ "$p" ]; then
-	echo >&2 "Killing poldek ($p), don't panic :)"
-	kill $p
-fi
 
 %triggerpostun -- %{name} < 4.4.9-44
 %{_rpmlibdir}/hrmib-cache
@@ -1384,6 +1364,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.70  2008/11/17 21:05:37  glen
+- drop killing poldek; rel 93
+
 Revision 1.837.2.42.2.69  2008/11/07 01:19:59  glen
 - jbj_: you do need the reversed arrows patch too. rel 92
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.2.42.2.69&r2=1.837.2.42.2.70&f=u