SPECS: rpm.spec - AC-branch merge

[glen]

Author: glen                         Date: Mon Feb 11 13:31:08 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- AC-branch merge

---- Files affected:
SPECS:
   rpm.spec (1.870 -> 1.871) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.870 SPECS/rpm.spec:1.871
--- SPECS/rpm.spec:1.870	Mon Feb 11 14:29:11 2008
+++ SPECS/rpm.spec	Mon Feb 11 14:31:03 2008
@@ -474,7 +474,7 @@
 Summary(uk.UTF-8):	Скрипти та утиліти, необхідні для побудови пакетів
 Group:		Applications/File
 Requires(pre):	findutils
-Requires:	%{name}-build-macros >= 1.314
+Requires:	%{name}-build-macros >= 1.417
 Requires:	%{name}-utils = %{version}-%{release}
 Requires:	/bin/id
 Requires:	awk
@@ -1026,6 +1026,16 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerpostun lib -- %{name}-lib < %{version}
+rm -f /var/lib/rpm/__db*
+
+%pretrans
+# this needs to be a dir
+if [ -f %{_sysconfdir}/rpm/sysinfo ]; then
+	mv -f %{_sysconfdir}/rpm/sysinfo{,.rpmsave}
+	mkdir %{_sysconfdir}/rpm/sysinfo
+fi
+
 %post	lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
 
@@ -1251,6 +1261,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.871  2008-02-11 13:31:03  glen
+- AC-branch merge
+
 Revision 1.870  2008-02-11 13:29:11  glen
 - alter system files in pretrans
 
================================================================

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