SPECS (AC-branch): rpm.spec - jbj says commas not likely supported...

[glen]

Author: glen                         Date: Mon Feb 18 21:49:47 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- jbj says commas not likely supported in triggers
- hourly update r43

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

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.15 SPECS/rpm.spec:1.837.2.42.2.16
--- SPECS/rpm.spec:1.837.2.42.2.15	Mon Feb 18 22:25:48 2008
+++ SPECS/rpm.spec	Mon Feb 18 22:49:42 2008
@@ -36,7 +36,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.4.9
-Release:	42
+Release:	43
 License:	LGPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
@@ -1051,7 +1051,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerpostun lib -- %{name}-lib < %{version}, db < %{reqdb_ver}, db4.5 < %{reqdb_ver}
+%triggerpostun lib -- %{name}-lib < %{version}
 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:
@@ -1070,6 +1070,26 @@
 fi
 echo >&2 "You should rebuild your rpmdb: rpm --rebuilddb to avoid random rpmdb errors"
 
+%triggerpostun lib -- db < %{reqdb_ver}
+echo >&2 "Removing /var/lib/rpm/__db* from older rpmdb version"
+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"
+
+%triggerpostun lib -- db4.5 < %{reqdb_ver}
+echo >&2 "Removing /var/lib/rpm/__db* from older rpmdb version"
+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
 if [ -f %{_sysconfdir}/rpm/sysinfo ]; then
@@ -1299,6 +1319,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.16  2008-02-18 21:49:42  glen
+- jbj says commas not likely supported in triggers
+- hourly update r43
+
 Revision 1.837.2.42.2.15  2008-02-18 21:25:48  glen
 - daily update r42
 
================================================================

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