SPECS (AC-branch): rpm.spec - merge mimetype deps, -perl_req-use_base.patch...

[glen]

Author: glen                         Date: Wed Aug 27 21:00:09 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge mimetype deps, -perl_req-use_base.patch from rpm-4_4_9

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.53 -> 1.837.2.42.2.54) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.53 SPECS/rpm.spec:1.837.2.42.2.54
--- SPECS/rpm.spec:1.837.2.42.2.53	Wed Aug 27 22:56:48 2008
+++ SPECS/rpm.spec	Wed Aug 27 23:00:03 2008
@@ -62,10 +62,10 @@
 Source16:	%{name}-java-requires
 # http://svn.pld-linux.org/banner.sh/
 Source17:	banner.sh
+Source18:	%{name}-mimetypedeps
 Patch1067:	%{name}-disable-features.patch
 Patch1069:	%{name}-parentdirs.patch
 Patch1070:	%{name}-rpmrc-ac.patch
-
 Patch0:		%{name}-pl.po.patch
 Patch1:		%{name}-rpmrc.patch
 Patch2:		%{name}-arch.patch
@@ -85,7 +85,7 @@
 Patch16:	%{name}-php-deps.patch
 Patch17:	%{name}-ldconfig-always.patch
 Patch18:	%{name}-macros-ac.patch
-Patch19:	%{name}-link.patch
+
 Patch20:	%{name}-magic-usesystem.patch
 Patch21:	%{name}-dontneedutils.patch
 Patch22:	%{name}-provides-dont-obsolete.patch
@@ -139,6 +139,9 @@
 Patch72:	%{name}-rpm5-patchset-7657.patch
 Patch73:	%{name}-namespace-probe.patch
 Patch74:	%{name}-mktemperror.patch
+Patch75:	%{name}-mimetype.patch
+Patch76:	%{name}-link.patch
+Patch77:	%{name}-perl_req-use_base.patch
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.4
@@ -670,7 +673,6 @@
 install %{SOURCE9} scripts/php.prov.in
 install %{SOURCE10} scripts/php.req.in
 install %{SOURCE12} scripts/perl.prov
-%patch19 -p1
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
@@ -725,6 +727,9 @@
 %patch72 -p0
 %patch73 -p1
 %patch74 -p1
+%patch75 -p1
+%patch76 -p1
+%patch77 -p1
 
 mv -f scripts/{perl.req,perl.req.in}
 mv -f scripts/{perl.prov,perl.prov.in}
@@ -913,6 +918,7 @@
 install %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires
 install scripts/php.{prov,req}	$RPM_BUILD_ROOT%{_rpmlibdir}
 install %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache
+install %{SOURCE18} $RPM_BUILD_ROOT%{_rpmlibdir}/mimetypedeps.sh
 install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/rpm
 
 install %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/banner.sh
@@ -1256,6 +1262,7 @@
 %attr(755,root,root) %{_rpmlibdir}/u_pkg.sh
 %attr(755,root,root) %{_rpmlibdir}/executabledeps.sh
 %attr(755,root,root) %{_rpmlibdir}/libtooldeps.sh
+%attr(755,root,root) %{_rpmlibdir}/mimetypedeps.sh
 # needs hacked pkg-config to return anything
 %attr(755,root,root) %{_rpmlibdir}/pkgconfigdeps.sh
 %attr(755,root,root) %{_rpmlibdir}/rpmb
@@ -1353,6 +1360,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.54  2008/08/27 21:00:03  glen
+- merge mimetype deps, -perl_req-use_base.patch from rpm-4_4_9
+
 Revision 1.837.2.42.2.53  2008/08/27 20:56:48  glen
 - include th gpg key
 
================================================================

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