SPECS (AC-branch): rpm.spec - add /var/cache/hrmib dir and initial...

[glen]

Author: glen                         Date: Wed Feb 20 16:53:35 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- add /var/cache/hrmib dir and initial fillup

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

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.16 SPECS/rpm.spec:1.837.2.42.2.17
--- SPECS/rpm.spec:1.837.2.42.2.16	Mon Feb 18 22:49:42 2008
+++ SPECS/rpm.spec	Wed Feb 20 17:53:29 2008
@@ -36,7 +36,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.4.9
-Release:	43
+Release:	43.10
 License:	LGPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
@@ -45,6 +45,7 @@
 Source2:	%{name}.platform
 Source3:	%{name}-install-tree
 Source4:	%{name}-find-spec-bcond
+Source5:	%{name}-hrmib-cache
 Source6:	%{name}-groups-po.awk
 Source7:	%{name}-compress-doc
 Source8:	RPM-GPG-KEY
@@ -785,7 +786,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/banner}
+install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/banner,/var/cache/hrmib}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -1052,6 +1053,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %triggerpostun lib -- %{name}-lib < %{version}
+echo >&2 "rpmlib upgrade 1[$1] 2[$2]"
 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,17 +1072,8 @@
 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 "db4.5 upgrade 1[$1] 2[$2]"
 echo >&2 "Removing /var/lib/rpm/__db* from older rpmdb version"
 rm -f /var/lib/rpm/__db*
 p=$(/sbin/pidof poldek)
@@ -1097,6 +1090,9 @@
 	mkdir %{_sysconfdir}/rpm/sysinfo
 fi
 
+%triggerpostun -- %{name} < 4.4.9-43.10
+%(cat %{SOURCE5})
+
 %post	lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
 
@@ -1135,6 +1131,10 @@
 %dir /var/lock/rpm
 /var/lock/rpm/transaction
 
+# exported package NVRA (stamped with install tid)
+# net-snmp hrSWInstalledName queries, bash-completions
+%dir /var/cache/hrmib
+
 #%attr(755,root,root) %{_rpmlibdir}/rpmd
 #%{!?with_static:%attr(755,root,root) %{_rpmlibdir}/rpm[eiu]}
 #%attr(755,root,root) %{_rpmlibdir}/rpmk
@@ -1319,6 +1319,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.17  2008-02-20 16:53:29  glen
+- add /var/cache/hrmib dir and initial fillup
+
 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
================================================================

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