SPECS (rpm-4_4_9): rpm.spec - disable reverse arrows patch (broken...
glen
glen at pld-linux.org
Tue Apr 8 12:45:00 CEST 2008
Author: glen Date: Tue Apr 8 10:45:00 2008 GMT
Module: SPECS Tag: rpm-4_4_9
---- Log message:
- disable reverse arrows patch (broken)
- sysinfo -> dir handled ok by rpm; rel 64
---- Files affected:
SPECS:
rpm.spec (1.837.2.62 -> 1.837.2.63)
---- Diffs:
================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.62 SPECS/rpm.spec:1.837.2.63
--- SPECS/rpm.spec:1.837.2.62 Mon Apr 7 21:06:16 2008
+++ SPECS/rpm.spec Tue Apr 8 12:44:54 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
@@ -129,7 +129,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
@@ -710,7 +711,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}
@@ -898,7 +900,6 @@
install %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/banner.sh
install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo
-
touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Conflictname
touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Dirnames
install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Filelinktos
@@ -1055,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
@@ -1302,6 +1295,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.837.2.63 2008-04-08 10:44:54 glen
+- disable reverse arrows patch (broken)
+- sysinfo -> dir handled ok by rpm; rel 64
+
Revision 1.837.2.62 2008-04-07 19:06:16 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.2.62&r2=1.837.2.63&f=u
More information about the pld-cvs-commit
mailing list