RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 21-Aug-2009 05:18:38
Branch: HEAD Handle: 2009082103183602
Modified files:
rpm Makefile.am
rpm/macros macros.in perl.in php.in python.in
rpm/perlRPM.xs
rpm/rpmio librpmio.vers macro.c rpmlua.c rpmmacro.h
Removed files:
rpm macros.in
Log:
- macros: refactor perl/php/python peculier config into separate file.
- macros: expand %{load:...} immediiately/recursively when loading.
Summary:
RevisionChanges Path
2.242 +7 -2 rpm/Makefile.am
1.291 +0 -1765 rpm/macros.in
1.2 +7 -50 rpm/macros/macros.in
1.2 +31 -7 rpm/macros/perl.in
1.2 +3 -5 rpm/macros/php.in
1.2 +24 -9 rpm/macros/python.in
1.32+1 -1 rpm/perl/RPM.xs
2.136 +1 -0 rpm/rpmio/librpmio.vers
2.237 +48 -12 rpm/rpmio/macro.c
2.75+2 -1 rpm/rpmio/rpmlua.c
2.54+2 -1 rpm/rpmio/rpmmacro.h
patch -p0 '@@ .'
Index: rpm/Makefile.am
$ cvs diff -u -r2.241 -r2.242 Makefile.am
--- rpm/Makefile.am 21 Aug 2009 00:11:23 - 2.241
+++ rpm/Makefile.am 21 Aug 2009 03:18:36 - 2.242
@@ -116,8 +116,13 @@
endif
pkglibdir = @USRLIBRPM@
-pkglib_DATA =rpmpopt macros/macros cpuinfo.yaml
-pkglib_SCRIPTS = install-sh mkinstalldirs
+pkglib_DATA = rpmpopt macros/macros cpuinfo.yaml
+
+pkgbindir = $(pkglibdir)/bin
+pkgbin_SCRIPTS = install-sh mkinstalldirs
+
+pkgcfgdir = $(pkglibdir)/macros.d
+pkgcfg_DATA = macros/perl macros/php macros/python
noinst_HEADERS = build.h debug.h system.h
@@ .
rm -f rpm/macros.in '@@ .'
Index: rpm/macros.in
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 '@@ .'
Index: rpm/macros/macros.in
$ cvs diff -u -r1.1 -r1.2 macros.in
--- rpm/macros/macros.in 21 Aug 2009 00:11:24 - 1.1
+++ rpm/macros/macros.in 21 Aug 2009 03:18:37 - 1.2
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.1 2009/08/21 00:11:24 jbj Exp $
+# $Id: macros.in,v 1.2 2009/08/21 03:18:37 jbj Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -77,10 +77,7 @@
%__mv@__MV@
%__patch @__PATCH@
%__pax @__PAX@
-%__perl @__PERL@
%__pgp @__PGP@
-%__php @__PHP@
-%__python@__PYTHON@
%__rm@__RM@
%__rsh @__RSH@
%__sed @__SED@
@@ -1616,6 +1613,8 @@
#
%find_lang %{_rpmhome}/find-lang.sh %{buildroot}
+%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)
+
#
# lua macros
#
@@ -1640,38 +1639,7 @@
%__perl_provides %{_rpmhome}/perl.prov
%__perl_requires %{_rpmhome}/perl.req
-# Useful macros for building *.rpm perl packages.
-#(from Artur Frysiak wi...@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_eqperl
-#[...]
-#%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)
