SPECS: rpm.spec - PEAR build macros moved to rpm-build-macros

[glen]

Author: glen                         Date: Tue May 23 20:07:54 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- PEAR build macros moved to rpm-build-macros

---- Files affected:
SPECS:
   rpm.spec (1.745 -> 1.746) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.745 SPECS/rpm.spec:1.746
--- SPECS/rpm.spec:1.745	Fri May  5 14:18:14 2006
+++ SPECS/rpm.spec	Tue May 23 22:07:49 2006
@@ -54,7 +54,6 @@
 Source32:	pldnotify.awk
 # http://svn.pld-linux.org/banner.sh/
 Source33:	banner.sh
-Source34:	php-pear-build-macros
 Patch0:		%{name}-pl.po.patch
 Patch1:		%{name}-rpmrc.patch
 Patch2:		%{name}-arch.patch
@@ -562,16 +561,10 @@
 Additional utilities for checking php pear provides/requires in rpm
 packages.
 
-This package provides rpm macros and dependencies to help building
-PEAR packages.
-
 %description php-pearprov -l pl
 Dodatkowe narzędzia do sprawdzenia zależności skryptów php pear w
 pakietach rpm.
 
-Ten pakiet dostarcza makra rpm-a i zależności pomagające przy
-budowaniu pakietów PEAR-a.
-
 %package -n python-rpm
 Summary:	Python interface to RPM library
 Summary(pl):	Pythonowy interfejs do biblioteki RPM-a
@@ -643,7 +636,8 @@
 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
-install %{SOURCE34} macros.php
+echo '%%define	__php_provides	/usr/lib/rpm/php.prov' > macros.php
+echo '%%define	__php_requires	/usr/lib/rpm/php.req' >> 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 %{SOURCE5} scripts/find-lang.sh
@@ -1164,6 +1158,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.746  2006/05/23 20:07:49  glen
+- PEAR build macros moved to rpm-build-macros
+
 Revision 1.745  2006/05/05 12:18:14  pluto
 - obsolete patch removed.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.745&r2=1.746&f=u