SPECS (AC-branch): rpm.spec - rpmbuild(macros) separated (finally!)

[glen]

Author: glen                         Date: Fri Oct 28 21:03:45 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- rpmbuild(macros) separated (finally!)

---- Files affected:
SPECS:
   rpm.spec (1.555.2.150 -> 1.555.2.151) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.555.2.150 SPECS/rpm.spec:1.555.2.151
--- SPECS/rpm.spec:1.555.2.150	Fri Oct 28 13:54:41 2005
+++ SPECS/rpm.spec	Fri Oct 28 23:03:39 2005
@@ -32,7 +32,7 @@
 Name:		rpm
 %define	sover	4.4
 Version:	4.4.2
-Release:	22
+Release:	22.3
 License:	GPL
 Group:		Base
 Source0:	ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -47,7 +47,7 @@
 Source8:	%{name}-check-files
 Source9:	%{name}-php-provides
 Source10:	%{name}-php-requires
-Source11:	%{name}.macros
+
 Source12:	perl.prov
 Source13:	%{name}-user_group.sh
 Source14:	%{name}.sysconfig
@@ -423,6 +423,7 @@
 Summary(uk):	óËŇÉĐÔÉ ÔÁ ŐÔÉĚŚÔÉ, ÎĹĎÂČŚÄÎŚ ÄĚŃ ĐĎÂŐÄĎ×É ĐÁËĹÔŚ×
 Group:		Applications/File
 Requires(pre):	findutils
+Requires:	%{name}-build-macros
 Requires:	%{name}-utils = %{version}-%{release}
 Requires:	/bin/id
 Requires:	awk
@@ -450,14 +451,12 @@
 Requires:	sh-utils
 Requires:	tar
 Requires:	textutils
-Provides:	rpmbuild(macros) = %{rpm_macros_rev}
 Provides:	rpmbuild(monoautodeps)
 Provides:	rpmbuild(noauto) = 3
 %ifarch %{x8664}
 Conflicts:	automake < 1:1.7.9-2
 Conflicts:	libtool < 2:1.5-13
 %endif
-Obsoletes:	rpmbuild(macros) < %{rpm_macros_rev}
 
 %description build
 Scripts for building binary RPM packages.
@@ -640,7 +639,7 @@
 %patch17 -p1
 %patch18 -p1
 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
-cp -f platform.in macros.pld.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
@@ -651,7 +650,6 @@
 install %{SOURCE9} scripts/php.prov.in
 install %{SOURCE10} scripts/php.req.in
 install %{SOURCE12} scripts/perl.prov
-cat %{SOURCE11} >> macros.in
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
@@ -1151,6 +1149,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.555.2.151  2005/10/28 21:03:39  glen
+- rpmbuild(macros) separated (finally!)
+
 Revision 1.555.2.150  2005/10/28 11:54:41  glen
 - rel 22
 
================================================================

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