SPECS (AC-branch): rpm.spec - daily update r42

[glen]

Author: glen                         Date: Mon Feb 18 21:25:53 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- daily update r42

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.14 -> 1.837.2.42.2.15) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.14 SPECS/rpm.spec:1.837.2.42.2.15
--- SPECS/rpm.spec:1.837.2.42.2.14	Mon Feb 18 08:47:28 2008
+++ SPECS/rpm.spec	Mon Feb 18 22:25:48 2008
@@ -23,7 +23,7 @@
 # force_cpp		- force using __cpp other than "%{_target_cpu}-pld-linux-gcc -E"
 
 # versions of required libraries
-%define	reqdb_ver	4.5.20-5
+%define	reqdb_ver	4.5.20-6
 %define	reqpopt_ver	1.10.8
 %define	beecrypt_ver	2:4.1.2-4
 %define	sover	4.4
@@ -36,7 +36,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.4.9
-Release:	41
+Release:	42
 License:	LGPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
@@ -1051,7 +1051,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerpostun lib -- %{name}-lib < %{version}
+%triggerpostun lib -- %{name}-lib < %{version}, db < %{reqdb_ver}, db4.5 < %{reqdb_ver}
+echo >&2 "Removing /var/lib/rpm/__db* from older rpmdb version"
 rm -f /var/lib/rpm/__db*
 # TODO: poldek should abort if it can't reopen rpmdb after rpm exec:
 #Installing set #3
@@ -1067,22 +1068,7 @@
 	echo >&2 "Killing poldek ($p), don't panic :)"
 	kill $p
 fi
-
-%triggerpostun lib -- db4.5 < %{reqdb_ver}
-rm -f /var/lib/rpm/__db*
-p=$(/sbin/pidof poldek)
-if [ "$p" ]; then
-	echo >&2 "Killing poldek ($p), don't panic :)"
-	kill $p
-fi
-
-%triggerpostun lib -- db < %{reqdb_ver}
-rm -f /var/lib/rpm/__db*
-p=$(/sbin/pidof poldek)
-if [ "$p" ]; then
-	echo >&2 "Killing poldek ($p), don't panic :)"
-	kill $p
-fi
+echo >&2 "You should rebuild your rpmdb: rpm --rebuilddb to avoid random rpmdb errors"
 
 %pretrans
 # this needs to be a dir
@@ -1313,6 +1299,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.15  2008-02-18 21:25:48  glen
+- daily update r42
+
 Revision 1.837.2.42.2.14  2008-02-18 07:47:28  glen
 - oh well, once again need to kill db region files; rel 41
 
@@ -1335,7 +1324,7 @@
 - find-lang moved to rpm-build-maros package; rel 37
 
 Revision 1.837.2.42.2.7  2008-02-14 13:07:24  glen
-- rpm must have conflicts < poldek, and poldek must bave requires > rpm for upgrade to work; rel 36
+- rpm must have conflicts < poldek, and poldek must have requires > rpm for upgrade to work; rel 36
 
 Revision 1.837.2.42.2.6  2008-02-14 08:40:34  glen
 - don't compress gpg key
================================================================

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