SOURCES (AC-branch): rpm-macros.patch - remove duplicate macros fr...

[glen]

Author: glen                         Date: Thu Jan 19 18:27:58 2006 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- remove duplicate macros from macros.build, and avoid macros here that invoke subshell

---- Files affected:
SOURCES:
   rpm-macros.patch (1.23.2.1 -> 1.23.2.2) 

---- Diffs:

================================================================
Index: SOURCES/rpm-macros.patch
diff -u SOURCES/rpm-macros.patch:1.23.2.1 SOURCES/rpm-macros.patch:1.23.2.2
--- SOURCES/rpm-macros.patch:1.23.2.1	Wed Nov  2 23:17:08 2005
+++ SOURCES/rpm-macros.patch	Thu Jan 19 19:27:53 2006
@@ -28,3 +28,42 @@
 +
  # \endverbatim
  #*/
+--- rpm-4.4.2/macros.in~	2006-01-17 20:55:45.000000000 +0200
++++ rpm-4.4.2/macros.in	2006-01-17 20:57:51.000000000 +0200
+@@ -1157,36 +1157,6 @@
+   %{-C:cd ${_mydir}; unset _mydir}
+ 
+ #------------------------------------------------------------------------------
+-# Useful perl macros (from Artur Frysiak <wiget at t17.ds.pwr.wroc.pl>)
+-#
+-# For example, these can be used as (from ImageMagick.spec from PLD site)
+-#	[...]
+-#	BuildPrereq: perl
+-#	[...]
+-#	%package perl
+-#	Summary: libraries and modules for access to ImageMagick from perl
+-#	Group: Development/Languages/Perl
+-#	Requires: %{name} = %{version}
+-#	%requires_eq    perl
+-#	[...]
+-#	%install
+-#	rm -fr $RPM_BUILD_ROOT
+-#	install -d $RPM_BUILD_ROOT/%{perl_sitearch}
+-#	[...]
+-#	%files perl
+-#	%defattr(644,root,root,755)
+-#	%{perl_sitearch}/Image
+-#	%dir %{perl_sitearch}/auto/Image
+-#
+-%requires_eq()	%(echo '%*' | LC_ALL="C" xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
+-%perl_sitearch	%(eval "`%{__perl} -V:installsitearch`"; echo $installsitearch)
+-%perl_sitelib	%(eval "`%{__perl} -V:installsitelib`"; echo $installsitelib)
+-%perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
+-%perl_vendorlib  %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+-%perl_archlib	%(eval "`%{__perl} -V:installarchlib`"; echo $installarchlib)
+-%perl_privlib	%(eval "`%{__perl} -V:installprivlib`"; echo $installprivlib)
+-
+-#------------------------------------------------------------------------------
+ # arch macro for all Intel i?86 compatibile processors
+ #  (Note: This macro (and it's analogues) will probably be obsoleted when
+ #   rpm can use regular expressions against target platforms in macro
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-macros.patch?r1=1.23.2.1&r2=1.23.2.2&f=u