RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 21-Aug-2009 18:48:52 Branch: HEAD Handle: 2009082116485101 Added files: rpm/macros java.in libtool.in mono.in pkgconfig.in Modified files: rpm CHANGES configure.ac rpm/macros .cvsignore macros.in perl.in php.in python.in Log: - macros: automagic dependency extractors are now per-interpreter. Summary: Revision Changes Path 1.3087 +3 -0 rpm/CHANGES 2.387 +3 -1 rpm/configure.ac 1.2 +4 -0 rpm/macros/.cvsignore 1.1 +10 -0 rpm/macros/java.in 1.1 +10 -0 rpm/macros/libtool.in 1.3 +5 -58 rpm/macros/macros.in 1.1 +10 -0 rpm/macros/mono.in 1.3 +9 -0 rpm/macros/perl.in 1.3 +9 -0 rpm/macros/php.in 1.1 +11 -0 rpm/macros/pkgconfig.in 1.3 +7 -0 rpm/macros/python.in ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3086 -r1.3087 CHANGES --- rpm/CHANGES 21 Aug 2009 00:11:23 -0000 1.3086 +++ rpm/CHANGES 21 Aug 2009 16:48:51 -0000 1.3087 @@ -1,5 +1,8 @@ 5.2b1 -> 5.3a1 + - jbj: macros: automagic dependency extractors are now per-interpreter. + - jbj: macros: refactor perl/php/python peculier config into separate file. + - jbj: macros: expand %{load:...} immediiately/recursively when loading. - jbj: macros: gather "default" config into macros/ dir for refactoring. - proyvind: rpmevr: make rpmEVRparse() work with missing values. - proyvind: rpm46compat: Implement RPM 4.6 API wrapper providing ~seamless @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac ============================================================================ $ cvs diff -u -r2.386 -r2.387 configure.ac --- rpm/configure.ac 21 Aug 2009 00:11:23 -0000 2.386 +++ rpm/configure.ac 21 Aug 2009 16:48:51 -0000 2.387 @@ -1970,7 +1970,9 @@ AC_CONFIG_FILES([ po/Makefile.in Doxyfile Makefile macros/macros rpmpopt rpm.spec rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile - scripts/Makefile macros/perl macros/php macros/python + scripts/Makefile + macros/java macros/libtool macros/mono macros/perl + macros/pkgconfig macros/php macros/python tools/Makefile misc/Makefile doc/Makefile doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile @@ . patch -p0 <<'@@ .' Index: rpm/macros/.cvsignore ============================================================================ $ cvs diff -u -r1.1 -r1.2 .cvsignore --- rpm/macros/.cvsignore 21 Aug 2009 00:11:24 -0000 1.1 +++ rpm/macros/.cvsignore 21 Aug 2009 16:48:52 -0000 1.2 @@ -1,4 +1,8 @@ +java +libtool macros +mono perl php +pkgconfig python @@ . patch -p0 <<'@@ .' Index: rpm/macros/java.in ============================================================================ $ cvs diff -u -r0 -r1.1 java.in --- /dev/null 2009-08-21 18:45:27 +0200 +++ java.in 2009-08-21 18:48:52 +0200 @@ -0,0 +1,10 @@ +# Java specific macro definitions. +# To make use of these macros insert the following line into your spec file: +# %{load:%{_usrlibrpm}/macros.d/java} + +# Path to scripts to autogenerate java package dependencies, +# +# Note: Used iff _use_internal_dependency_generator is non-zero. The +# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. +%__java_provides %{_rpmhome}/javadeps.sh --provides +%__java_requires %{_rpmhome}/javadeps.sh --requires @@ . patch -p0 <<'@@ .' Index: rpm/macros/libtool.in ============================================================================ $ cvs diff -u -r0 -r1.1 libtool.in --- /dev/null 2009-08-21 18:45:27 +0200 +++ libtool.in 2009-08-21 18:48:52 +0200 @@ -0,0 +1,10 @@ +# Libtool specific macro definitions. +# To make use of these macros insert the following line into your spec file: +# %{load:%{_usrlibrpm}/macros.d/libtool} + +# Path to scripts to autogenerate libtool package dependencies, +# +# Note: Used iff _use_internal_dependency_generator is non-zero. The +# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. +%__libtool_provides %{_rpmhome}/libtooldeps.sh --provides %{buildroot} %{name} +%__libtool_requires %{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name} @@ . patch -p0 <<'@@ .' Index: rpm/macros/macros.in ============================================================================ $ cvs diff -u -r1.2 -r1.3 macros.in --- rpm/macros/macros.in 21 Aug 2009 03:18:37 -0000 1.2 +++ rpm/macros/macros.in 21 Aug 2009 16:48:52 -0000 1.3 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.2 2009/08/21 03:18:37 jbj Exp $ +# $Id: macros.in,v 1.3 2009/08/21 16:48:52 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 @@ -1628,84 +1628,31 @@ #------------------------------------------------------------------------ # perl(...) configuration -# - -# Path to scripts to autogenerate perl package dependencies, -# -# Note: Used iff _use_internal_dependency_generator is non-zero. The -# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. -#%__perl_provides %{_rpmhome}/perldeps.pl --provides -#%__perl_requires %{_rpmhome}/perldeps.pl --requires -%__perl_provides %{_rpmhome}/perl.prov -%__perl_requires %{_rpmhome}/perl.req - %{load:%{_usrlibrpm}/macros.d/perl} #------------------------------------------------------------------------ # python(...) configuration. -# -# Path to scripts to autogenerate python package dependencies, -# -# Note: Used iff _use_internal_dependency_generator is non-zero. The -# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. -%__python_provides %{_rpmhome}/pythondeps.sh --provides -%__python_requires %{_rpmhome}/pythondeps.sh --requires - %{load:%{_usrlibrpm}/macros.d/python} #------------------------------------------------------------------------ # php(...) configuration. -# -# Path to scripts to autogenerate php package dependencies, -# -# Note: Used iff _use_internal_dependency_generator is non-zero. The -# 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 - %{load:%{_usrlibrpm}/macros.d/php} #------------------------------------------------------------------------ # java(...) configuration. -# -# Path to scripts to autogenerate java package dependencies, -# -# Note: Used iff _use_internal_dependency_generator is non-zero. The -# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. -%__java_provides %{_rpmhome}/javadeps.sh --provides -%__java_requires %{_rpmhome}/javadeps.sh --requires +%{load:%{_usrlibrpm}/macros.d/java} #------------------------------------------------------------------------ # libtool(...) configuration. -# -# Path to scripts to autogenerate libtool package dependencies, -# -# Note: Used iff _use_internal_dependency_generator is non-zero. The -# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. -%__libtool_provides %{_rpmhome}/libtooldeps.sh --provides %{buildroot} %{name} -%__libtool_requires %{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name} +%{load:%{_usrlibrpm}/macros.d/java} #------------------------------------------------------------------------ # pkgconfig(...) configuration. -# -# Path to scripts to autogenerate pkgconfig package dependencies, -# -# Note: Used iff _use_internal_dependency_generator is non-zero. The -# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. -%__pkgconfig_provides %{_rpmhome}/pkgconfigdeps.sh --provides -%__pkgconfig_requires %{_rpmhome}/pkgconfigdeps.sh --requires +%{load:%{_usrlibrpm}/macros.d/java} #------------------------------------------------------------------------ # mono(...) configuration. -# -# Path to scripts to autogenerate mono package dependencies, -# -# 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 +%{load:%{_usrlibrpm}/macros.d/java} #------------------------------------------------------------------------ # executable(...) configuration. @@ . patch -p0 <<'@@ .' Index: rpm/macros/mono.in ============================================================================ $ cvs diff -u -r0 -r1.1 mono.in --- /dev/null 2009-08-21 18:45:27 +0200 +++ mono.in 2009-08-21 18:48:52 +0200 @@ -0,0 +1,10 @@ +# Mono specific macro definitions. +# To make use of these macros insert the following line into your spec file: +# %{load:%{_usrlibrpm}/macros.d/mono} + +# Path to scripts to autogenerate mono package dependencies, +# +# 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 @@ . patch -p0 <<'@@ .' Index: rpm/macros/perl.in ============================================================================ $ cvs diff -u -r1.2 -r1.3 perl.in --- rpm/macros/perl.in 21 Aug 2009 03:18:37 -0000 1.2 +++ rpm/macros/perl.in 21 Aug 2009 16:48:52 -0000 1.3 @@ -5,6 +5,15 @@ %__perl @__PERL@ +# Path to scripts to autogenerate perl package dependencies, +# +# Note: Used iff _use_internal_dependency_generator is non-zero. The +# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. +#%__perl_provides %{_rpmhome}/perldeps.pl --provides +#%__perl_requires %{_rpmhome}/perldeps.pl --requires +%__perl_provides %{_rpmhome}/perl.prov +%__perl_requires %{_rpmhome}/perl.req + # Useful macros for building *.rpm perl packages. # (from Artur Frysiak <[email protected]>) # @@ . patch -p0 <<'@@ .' Index: rpm/macros/php.in ============================================================================ $ cvs diff -u -r1.2 -r1.3 php.in --- rpm/macros/php.in 21 Aug 2009 03:18:37 -0000 1.2 +++ rpm/macros/php.in 21 Aug 2009 16:48:52 -0000 1.3 @@ -4,4 +4,13 @@ %__php @__PHP@ +# Path to scripts to autogenerate php package dependencies, +# +# Note: Used iff _use_internal_dependency_generator is non-zero. The +# 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_pear_dir %{_datadir}/pear @@ . patch -p0 <<'@@ .' Index: rpm/macros/pkgconfig.in ============================================================================ $ cvs diff -u -r0 -r1.1 pkgconfig.in --- /dev/null 2009-08-21 18:45:27 +0200 +++ pkgconfig.in 2009-08-21 18:48:52 +0200 @@ -0,0 +1,11 @@ +# Pkgconfig specific macro definitions. +# To make use of these macros insert the following line into your spec file: +# %{load:%{_usrlibrpm}/macros.d/pkgconfig} +# + +# Path to scripts to autogenerate pkgconfig package dependencies, +# +# Note: Used iff _use_internal_dependency_generator is non-zero. The +# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. +%__pkgconfig_provides %{_rpmhome}/pkgconfigdeps.sh --provides +%__pkgconfig_requires %{_rpmhome}/pkgconfigdeps.sh --requires @@ . patch -p0 <<'@@ .' Index: rpm/macros/python.in ============================================================================ $ cvs diff -u -r1.2 -r1.3 python.in --- rpm/macros/python.in 21 Aug 2009 03:18:37 -0000 1.2 +++ rpm/macros/python.in 21 Aug 2009 16:48:52 -0000 1.3 @@ -4,6 +4,13 @@ %__python @__PYTHON@ +# Path to scripts to autogenerate python package dependencies, +# +# Note: Used iff _use_internal_dependency_generator is non-zero. The +# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. +%__python_provides %{_rpmhome}/pythondeps.sh --provides +%__python_requires %{_rpmhome}/pythondeps.sh --requires +# # python main version %py_ver %(echo `python -c "import sys; print sys.version[:3]"`) @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
