[packages/rpm] - instead of complicated dance with adding our macro files, just patch those provided by upstream

baggins baggins at pld-linux.org
Wed Sep 5 18:20:43 CEST 2012


commit 37e965e83af05766c7487c942385dc8ce496fcb0
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Sep 5 18:16:52 2012 +0200

    - instead of complicated dance with adding our macro files, just
      patch those provided by upstream

 macros.php           |  3 ---
 rpm-javadeps.patch   |  2 +-
 rpm-macros.java      |  2 --
 rpm-mono.patch       | 10 ----------
 rpm-php-macros.patch | 13 +++++++++++++
 rpm.spec             | 21 ++-------------------
 6 files changed, 16 insertions(+), 35 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 531c73e..fda1614 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -76,7 +76,6 @@ Source11:	%{name}.sysinfo
 Source12:	perl.prov
 Source13:	%{name}-user_group.sh
 Source14:	%{name}.sysconfig
-Source15:	%{name}-macros.java
 Source16:	%{name}-java-requires
 # http://svn.pld-linux.org/banner.sh/
 Source17:	banner.sh
@@ -90,7 +89,6 @@ Source24:	rpm.noautoprovfiles
 Source25:	rpm.noautoreq
 Source26:	rpm.noautoreqdep
 Source27:	rpm.noautoreqfiles
-Source28:	macros.php
 Source29:	%{name}-php-requires.php
 
 Patch0:		%{name}-branch.patch
@@ -120,7 +118,6 @@ Patch41:	vendor-pld.patch
 
 Patch42:	%{name}-old-fileconflicts-behaviour.patch
 
-Patch46:	%{name}-mono.patch
 Patch47:	%{name}-javadeps.patch
 
 Patch55:	%{name}-truncate-cvslog.patch
@@ -670,11 +667,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 # CHECK ME - macrofiles: ~/etc could be used
 #%%patch14 -p1
 %patch16 -p1
-echo '%%define	__perl_provides	%%{__perl} /usr/lib/rpm/perl.prov' > macros.perl
-echo '%%define	__perl_requires	%%{__perl} /usr/lib/rpm/perl.req' >> macros.perl
-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 %{SOURCE9} scripts/php.prov.in
 install %{SOURCE10} scripts/php.req.in
 install %{SOURCE12} scripts/perl.prov
@@ -690,7 +682,6 @@ install %{SOURCE12} scripts/perl.prov
 %patch37 -p1
 %patch41 -p1
 %patch42 -p1
-%patch46 -p1
 %patch47 -p1
 %patch55 -p1
 %patch59 -p1
@@ -902,11 +893,6 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh
 # not installed since 4.4.8 (-tools-perl subpackage)
 install scripts/rpmdiff scripts/rpmdiff.cgi $RPM_BUILD_ROOT%{_rpmlibdir}
 
-install macros.perl	$RPM_BUILD_ROOT%{_rpmlibdir}/macros.perl
-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 %{SOURCE1} doc/manual/groups
 install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
 install %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond
@@ -1180,14 +1166,11 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_rpmlibdir}/ia32e*
 %{_rpmlibdir}/x86_64*
 %endif
-# must be here for "Requires: rpm-*prov" to work
-%{_rpmlibdir}/macros.java
-%{_rpmlibdir}/macros.mono
-%{_rpmlibdir}/macros.perl
-%{_rpmlibdir}/macros.php
 # not used yet ... these six depend on perl
 %attr(755,root,root) %{_rpmlibdir}/http.req
 %attr(755,root,root) %{_rpmlibdir}/mono*
+
+# must be here for "Requires: rpm-*prov" to work
 %{_rpmlibdir}/macros.d/cmake
 %{_rpmlibdir}/macros.d/gstreamer
 %{_rpmlibdir}/macros.d/java
diff --git a/macros.php b/macros.php
deleted file mode 100644
index 81064f1..0000000
--- a/macros.php
+++ /dev/null
@@ -1,3 +0,0 @@
-%define	__php_provides	/usr/lib/rpm/php.prov
-# define 'php_req_new' in ~/.rpmmacros to use php version of req finder
-%define	__php_requires	env PHP_MIN_VERSION=%{?php_min_version} /usr/lib/rpm/php.req%{?php_req_new:.php}
diff --git a/rpm-javadeps.patch b/rpm-javadeps.patch
index 7b7524b..9a88b49 100644
--- a/rpm-javadeps.patch
+++ b/rpm-javadeps.patch
@@ -20,7 +20,7 @@
 -%__java_provides	%{_rpmhome}/javadeps.sh --provides
 -%__java_requires	%{_rpmhome}/javadeps.sh --requires
 +%__java_provides	%{nil}
-+%__java_requires	%{nil}
++%__java_requires	env RPM_BUILD_ROOT=%{buildroot} %{_rpmhome}/java-find-requires
  
  #	The value of CLASSPATH in build scriptlets (iff configured).
  #	
diff --git a/rpm-macros.java b/rpm-macros.java
deleted file mode 100644
index 30e1539..0000000
--- a/rpm-macros.java
+++ /dev/null
@@ -1,2 +0,0 @@
-%define	__java_provides	%{nil}
-%define	__java_requires	env RPM_BUILD_ROOT=%{buildroot} /usr/lib/rpm/java-find-requires
diff --git a/rpm-mono.patch b/rpm-mono.patch
deleted file mode 100644
index 6801f03..0000000
--- a/rpm-mono.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- rpm-5.3.1/macros/mono.in.wiget	2010-05-30 16:58:43.653464509 +0200
-+++ rpm-5.3.1/macros/mono.in	2010-05-30 16:59:15.576066903 +0200
-@@ -6,5 +6,5 @@
- #
- # Note: Used iff _use_internal_dependency_generator is non-zero. The
- # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
--%__mono_provides	%{_rpmhome}/mono-find-provides
--%__mono_requires	%{_rpmhome}/mono-find-requires
-+%__mono_provides	%{nil}
-+%__mono_requires	%{nil}
diff --git a/rpm-php-macros.patch b/rpm-php-macros.patch
index e16dc36..20b8668 100644
--- a/rpm-php-macros.patch
+++ b/rpm-php-macros.patch
@@ -8,3 +8,16 @@
      rpmdb/DB_CONFIG
      macros/macros macros/macros.rpmbuild
      macros/java macros/libtool macros/mono macros/perl 
+--- rpm-5.4.10/macros/php.in~	2010-10-16 05:38:31.000000000 +0200
++++ rpm-5.4.10/macros/php.in	2012-09-05 18:12:29.474278958 +0200
+@@ -10,7 +10,8 @@
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+ #%__php_provides	%{_rpmhome}/phpdeps.sh --provides
+ #%__php_requires	%{_rpmhome}/phpdeps.sh --requires
+-#%__php_provides		%{_rpmhome}/php.prov
+-#%__php_requires		%{_rpmhome}/php.req
++%__php_provides		%{_rpmhome}/php.prov
++# define 'php_req_new' in ~/.rpmmacros to use php version of req finder
++%__php_requires		env PHP_MIN_VERSION=%{?php_min_version} %{_rpmhome}/php.req%{?php_req_new:.php}
+ 
+ %php_pear_dir	%{_datadir}/pear
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/37e965e83af05766c7487c942385dc8ce496fcb0



More information about the pld-cvs-commit mailing list