SPECS: rpm.spec - drop rpm-macros.patch; use SOURCES/rpm-pld.macros

[arekm]

Author: arekm                        Date: Tue Oct  2 19:05:10 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- drop rpm-macros.patch; use SOURCES/rpm-pld.macros

---- Files affected:
SPECS:
   rpm.spec (1.845 -> 1.846) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.845 SPECS/rpm.spec:1.846
--- SPECS/rpm.spec:1.845	Tue Oct  2 15:50:51 2007
+++ SPECS/rpm.spec	Tue Oct  2 21:05:05 2007
@@ -70,6 +70,7 @@
 Source16:	%{name}-java-requires
 # http://svn.pld-linux.org/banner.sh/
 Source17:	banner.sh
+Source18:	%{name}-pld.macros
 Patch0:		%{name}-pl.po.patch
 
 Patch3:		%{name}-rpmpopt.patch
@@ -105,8 +106,6 @@
 Patch46:	%{name}-mono.patch
 Patch47:	%{name}-javadeps.patch
 
-Patch50:	%{name}-macros.patch
-
 Patch52:	%{name}-morearchs.patch
 
 Patch55:	%{name}-truncate-cvslog.patch
@@ -616,8 +615,6 @@
 #%patch14 -p1
 %patch16 -p1
 %patch18 -p1
-sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
-#cp -f platform.in macros.pld.in # what for?
 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
@@ -641,8 +638,7 @@
 %patch32 -p1
 %patch34 -p1
 %patch35 -p0
-# CHECK ME
-#%patch36 -p1
+%patch36 -p1
 %patch37 -p1
 # CHECK ME
 #%patch41 -p1
@@ -650,7 +646,6 @@
 # CHECK ME, PROBABLY WILL NEED TO HANLE IN OTHER WAY since rpmfcSCRIPT already handles mono
 #%patch46 -p1
 %patch47 -p1
-%patch50 -p1
 # OLD COMMENTED OUT
 #%patch52 -p1
 %patch55 -p1
@@ -797,6 +792,7 @@
 install macros.php	$RPM_BUILD_ROOT%{_rpmlibdir}/macros.php
 install macros.mono	$RPM_BUILD_ROOT%{_rpmlibdir}/macros.mono
 install %{SOURCE15}	$RPM_BUILD_ROOT%{_rpmlibdir}/macros.java
+install %{SOURCE18}	$RPM_BUILD_ROOT%{_rpmlibdir}/macros.pld
 
 install %{SOURCE1} doc/manual/groups
 install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
@@ -985,6 +981,7 @@
 
 %{_rpmlibdir}/rpmpopt*
 %{_rpmlibdir}/macros
+%{_rpmlibdir}/macros.pld
 
 %files base
 %defattr(644,root,root,755)
@@ -1165,6 +1162,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.846  2007/10/02 19:05:05  arekm
+- drop rpm-macros.patch; use SOURCES/rpm-pld.macros
+
 Revision 1.845  2007/10/02 13:50:51  arekm
 - -provides-dont-obsolete.patch obsolete; leave tsc disabling patch in ifarch
 
================================================================

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