RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Mark Hatle Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 02-Jul-2007 19:57:31 Branch: HEAD Handle: 2007070218573100 Modified files: rpm/scripts macros.perl.in macros.php.in macros.python.in Log: Found three more instances of USRLIBRPM -> %{_usrlibrpm} Summary: Revision Changes Path 1.3 +3 -3 rpm/scripts/macros.perl.in 1.3 +3 -3 rpm/scripts/macros.php.in 1.3 +1 -1 rpm/scripts/macros.python.in ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/scripts/macros.perl.in ============================================================================ $ cvs diff -u -r1.2 -r1.3 macros.perl.in --- rpm/scripts/macros.perl.in 25 May 2007 17:36:39 -0000 1.2 +++ rpm/scripts/macros.perl.in 2 Jul 2007 17:57:31 -0000 1.3 @@ -1,9 +1,9 @@ # Perl specific macro definitions. # To make use of these macros insert the following line into your spec file: -# %include @USRLIBRPM@/macros.perl +# %include %{_usrlibrpm}/macros.perl -%define __find_requires @USRLIBRPM@/find-perl-requires -%define __find_provides @USRLIBRPM@/find-perl-provides +%define __find_requires %{_usrlibrpm}/find-perl-requires +%define __find_provides %{_usrlibrpm}/find-perl-provides %define perl_sitelib %(eval "`perl -V:installsitelib`"; echo $installsitelib) %define perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch) @@ . patch -p0 <<'@@ .' Index: rpm/scripts/macros.php.in ============================================================================ $ cvs diff -u -r1.2 -r1.3 macros.php.in --- rpm/scripts/macros.php.in 25 May 2007 17:36:39 -0000 1.2 +++ rpm/scripts/macros.php.in 2 Jul 2007 17:57:31 -0000 1.3 @@ -1,9 +1,9 @@ # Perl specific macro definitions. # To make use of these macros insert the following line into your spec file: -# %include @USRLIBRPM@/macros.php +# %include %{_usrlibrpm}/macros.php -%define __find_requires @USRLIBRPM@/find-php-requires -%define __find_provides @USRLIBRPM@/find-php-provides +%define __find_requires %{_usrlibrpm}/find-php-requires +%define __find_provides %{_usrlibrpm}/find-php-provides %define php_pear_dir %{_datadir}/pear @@ . patch -p0 <<'@@ .' Index: rpm/scripts/macros.python.in ============================================================================ $ cvs diff -u -r1.2 -r1.3 macros.python.in --- rpm/scripts/macros.python.in 25 May 2007 17:36:39 -0000 1.2 +++ rpm/scripts/macros.python.in 2 Jul 2007 17:57:31 -0000 1.3 @@ -1,6 +1,6 @@ # Python specific macro definitions. # To make use of these macros insert the following line into your spec file: -# %include @USRLIBRPM@/macros.python +# %include %{_usrlibrpm}/macros.python # python main version %define py_ver %(echo `python -c "import sys; print sys.version[:3]"`) @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org