SPECS: rpm.spec - generate mimetype(...) provides; merge from rpm-4_4_9 branch

[megabajt]

Author: megabajt                     Date: Tue Jul 29 18:12:56 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- generate mimetype(...) provides; merge from rpm-4_4_9 branch

---- Files affected:
SPECS:
   rpm.spec (1.903 -> 1.904) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.903 SPECS/rpm.spec:1.904
--- SPECS/rpm.spec:1.903	Tue Jul 29 19:56:02 2008
+++ SPECS/rpm.spec	Tue Jul 29 20:12:51 2008
@@ -91,6 +91,7 @@
 Source18:	%{name}-pld.macros
 Source19:	ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc
 # Source19-md5:  08b29584dd349aac9caa7610131a0a88
+Source20:	%{name}-mimetypedeps
 Source100:	%{name}-macros-athlon
 Source101:	%{name}-macros-i386
 Source102:	%{name}-macros-i486
@@ -144,7 +145,7 @@
 
 Patch58:	%{name}-repackage-wo-lzma.patch
 Patch59:	%{name}-libtool-deps.patch
-
+Patch60:	%{name}-mimetype.patch
 Patch61:	%{name}-sparc64.patch
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.60
@@ -702,6 +703,7 @@
 %patch59 -p1
 %patch17 -p1
 %patch18 -p1
+%patch60 -p1
 %ifarch sparc64
 %patch61 -p1
 %endif
@@ -918,6 +920,7 @@
 install %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires
 install scripts/find-php*	$RPM_BUILD_ROOT%{_rpmlibdir}
 install scripts/php.{prov,req}	$RPM_BUILD_ROOT%{_rpmlibdir}
+install %{SOURCE20} $RPM_BUILD_ROOT%{_rpmlibdir}/mimetypedeps.sh
 install %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache
 install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/rpm
 
@@ -1233,6 +1236,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
@@ -1331,6 +1335,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.904  2008/07/29 18:12:51  megabajt
+- generate mimetype(...) provides; merge from rpm-4_4_9 branch
+
 Revision 1.903  2008/07/29 17:56:02  arekm
 - reorder x86_64/amd64
 
================================================================

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