SPECS (Titanium): rpm.spec - merge with rpm-4_4_9

[glen]

Author: glen                         Date: Tue Apr  8 19:01:15 2008 GMT
Module: SPECS                         Tag: Titanium
---- Log message:
- merge with rpm-4_4_9

---- Files affected:
SPECS:
   rpm.spec (1.837.4.16 -> 1.837.4.17) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.4.16 SPECS/rpm.spec:1.837.4.17
--- SPECS/rpm.spec:1.837.4.16   Mon Apr  7 21:08:42 2008
+++ SPECS/rpm.spec      Tue Apr  8 21:01:10 2008
@@ -36,7 +36,7 @@
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       4.4.9
-Release:       61
+Release:       64
 License:       LGPL
 Group:         Base
 Source0:       http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
@@ -127,7 +127,8 @@
 Patch68:       %{name}-rpm5-patchset-9486.patch
 Patch69:       %{name}-popt-aliases.patch
 Patch70:       %{name}-lualeak.patch
-Patch71:       %{name}-rpm5-patchset-10061.patch
+#Patch71:      %{name}-rpm5-patchset-10061.patch
+Patch72:       %{name}-rpm5-patchset-7657.patch
 URL:           http://rpm5.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1.4
@@ -707,7 +708,8 @@
 %patch68 -p1
 %patch69 -p1
 %patch70 -p1
-%patch71 -p0
+#%patch71 -p0
+%patch72 -p0
 
 mv -f scripts/{perl.req,perl.req.in}
 mv -f scripts/{perl.prov,perl.prov.in}
@@ -1054,14 +1056,6 @@
 %triggerpostun lib -- %{name}-lib < %{version}
 rm -f /var/lib/rpm/__db*
 
-%pretrans
-# this needs to be a dir
-if [ -f %{_sysconfdir}/rpm/sysinfo ]; then
-       umask 022
-       mv -f %{_sysconfdir}/rpm/sysinfo{,.rpmsave}
-       mkdir %{_sysconfdir}/rpm/sysinfo
-fi
-
 %triggerpostun -- %{name} < 4.4.9-44
 %{_rpmlibdir}/hrmib-cache
 
@@ -1300,6 +1294,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.4.17  2008-04-08 19:01:10  glen
+- merge with rpm-4_4_9
+
 Revision 1.837.4.16  2008-04-07 19:08:42  glen
 - fix for erase-before-install problem; rel 61
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit