packages (rpm-4_5): rpm/rpm.spec - add macros.php as separate source

[glen]

Author: glen                         Date: Mon Nov 28 11:06:02 2011 GMT
Module: packages                      Tag: rpm-4_5
---- Log message:
- add macros.php as separate source

---- Files affected:
packages/rpm:
   rpm.spec (1.837.2.42.2.49.2.107 -> 1.837.2.42.2.49.2.108) 

---- Diffs:

================================================================
Index: packages/rpm/rpm.spec
diff -u packages/rpm/rpm.spec:1.837.2.42.2.49.2.107 packages/rpm/rpm.spec:1.837.2.42.2.49.2.108
--- packages/rpm/rpm.spec:1.837.2.42.2.49.2.107	Sat Oct  1 17:25:14 2011
+++ packages/rpm/rpm.spec	Mon Nov 28 12:05:57 2011
@@ -85,6 +85,7 @@
 # http://svn.pld-linux.org/banner.sh/
 Source18:	banner.sh
 Source19:	%{name}-macros.gstreamer
+Source20:	macros.php
 Patch1000:	%{name}-new-debuginfo.patch
 Patch1067:	%{name}-disable-features.patch
 Patch1070:	%{name}-rpmrc-ac.patch
@@ -726,8 +727,7 @@
 echo '%%define	__perl_provides	%%{__perl} /usr/lib/rpm/perl.prov' > macros.perl
 echo '%%define	__perl_requires	%%{__perl} /usr/lib/rpm/perl.req' >> macros.perl
 echo '# obsoleted file' > macros.python
-echo '%%define	__php_provides	/usr/lib/rpm/php.prov' > macros.php
-echo '%%define	__php_requires	/usr/lib/rpm/php.req' >> macros.php
+cp -p %{SOURCE20} macros.php
 echo '%%define	__mono_provides	/usr/lib/rpm/mono-find-provides' > macros.mono
 echo '%%define	__mono_requires	/usr/lib/rpm/mono-find-requires' >> macros.mono
 install %{SOURCE10} scripts/php.prov
@@ -1487,6 +1487,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.49.2.108  2011/11/28 11:05:57  glen
+- add macros.php as separate source
+
 Revision 1.837.2.42.2.49.2.107  2011/10/01 15:25:14  glen
 - BR ossp-uuid-devel with typo fix
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm.spec?r1=1.837.2.42.2.49.2.107&r2=1.837.2.42.2.49.2.108&f=u