X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm-perl-macros.patch;h=601c0598ba2a04eba380519de79cc5cdabf561d7;hp=ac0b6eeec86f7df11011c4b5a681e4c865fcce57;hb=25b42998f4af9efeb0d0b6993c71ff3d90d910e5;hpb=04ad64eccb6eb96696634eb9e09ce17dd1f305ab diff --git a/rpm-perl-macros.patch b/rpm-perl-macros.patch index ac0b6ee..601c059 100644 --- a/rpm-perl-macros.patch +++ b/rpm-perl-macros.patch @@ -1,135 +1,20 @@ -diff -urN rpm-3.0.5.orig/configure.in rpm-3.0.5/configure.in ---- rpm-3.0.5.orig/configure.in Sun Jul 30 00:05:48 2000 -+++ rpm-3.0.5/configure.in Sun Jul 30 00:07:06 2000 -@@ -181,6 +181,7 @@ - AC_PATH_PROG(__MKDIR, mkdir, /bin/mkdir, $MYPATH) - AC_PATH_PROG(__MV, mv, /bin/mv, $MYPATH) - AC_PATH_PROG(__PATCH, patch, /usr/bin/patch, $MYPATH) -+ AC_PATH_PROG(PERL, perl, /usr/bin/perl, $MYPATH) - AC_MSG_CHECKING(old version of patch) - PATCHVERSION=`patch --version 2>&1` - -@@ -913,7 +914,8 @@ - dnl export LIBS INCPATH CONFIG_SITE - - AC_CONFIG_SUBDIRS(popt) --AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt scripts/brp-redhat -+AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt -+ scripts/brp-redhat macros.perl scripts/perl.req scripts/perl.prov - lib/Makefile build/Makefile tools/Makefile scripts/Makefile - tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile - misc/Makefile po/Makefile.in intl/Makefile -diff -urN rpm-3.0.5.orig/macros.in rpm-3.0.5/macros.in ---- rpm-3.0.5.orig/macros.in Sun Jul 30 00:05:48 2000 -+++ rpm-3.0.5/macros.in Sun Jul 30 00:07:06 2000 -@@ -569,9 +569,11 @@ - # %{perl_sitearch}/Image - # %dir %{perl_sitearch}/auto/Image - # -+# -+# NOTE: %{perl_sitearch}, %{perl_archlib} and %{perl_sitelib} macros -+# has been moved to macros.perl (see info in this file for details). -+# - %requires_eq() %(LC_ALL="C" rpm -q --queryformat 'Requires:%%{NAME} = %%{VERSION}' %1| grep -v "is not") --%perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch) --%perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib) - - #------------------------------------------------------------------------------ - # arch macro for all Intel i?86 compatibile processors -diff -urN rpm-3.0.5.orig/macros.perl.in rpm-3.0.5/macros.perl.in ---- rpm-3.0.5.orig/macros.perl.in Thu Jan 1 01:00:00 1970 -+++ rpm-3.0.5/macros.perl.in Sun Jul 30 00:07:06 2000 -@@ -0,0 +1,12 @@ -+# Perl specific macro definitions. -+# To make use of these macros insert the following line into your spec file: -+# %include @RPMCONFIGDIR@/macros.perl -+ -+%define __find_requires @RPMCONFIGDIR@/find-perl-requires -+%define __find_provides @RPMCONFIGDIR@/find-perl-provides -+ -+%define perl_sitelib %(eval "`perl -V:installsitelib`"; echo $installsitelib) -+%define perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch) -+%define perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib) -+%define perl_privlib %(eval "`perl -V:installprivlib`"; echo $installprivlib) -+ -diff -urN rpm-3.0.5.orig/scripts/Makefile.am rpm-3.0.5/scripts/Makefile.am ---- rpm-3.0.5.orig/scripts/Makefile.am Sun Jul 9 17:36:20 2000 -+++ rpm-3.0.5/scripts/Makefile.am Sun Jul 30 00:07:51 2000 -@@ -8,7 +8,8 @@ - find-prov.pl find-req.pl cpanflute find-provides.perl \ - find-requires.perl get_magic.pl getpo.sh http.req \ - magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh \ -- vpkg-provides.sh vpkg-provides2.sh -+ vpkg-provides.sh vpkg-provides2.sh \ -+ find-perl-requires find-perl-provides - - installprefix = $(DESTDIR) - -@@ -21,4 +22,5 @@ - find-prov.pl find-req.pl cpanflute find-provides.perl \ - find-requires.perl get_magic.pl getpo.sh http.req \ - magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh \ -- vpkg-provides.sh vpkg-provides2.sh -+ vpkg-provides.sh vpkg-provides2.sh \ -+ find-perl-requires find-perl-provides -diff -urN rpm-3.0.5.orig/scripts/find-perl-provides rpm-3.0.5/scripts/find-perl-provides ---- rpm-3.0.5.orig/scripts/find-perl-provides Thu Jan 1 01:00:00 1970 -+++ rpm-3.0.5/scripts/find-perl-provides Sun Jul 30 00:07:06 2000 -@@ -0,0 +1,8 @@ -+#!/bin/sh -+ulimit -c 0 -+ -+filelist=`sed "s/['\"]/\\\&/g"` -+ -+echo $filelist|/usr/lib/rpm/find-provides -+/usr/lib/rpm/perl.prov $filelist -+ -diff -urN rpm-3.0.5.orig/scripts/find-perl-requires rpm-3.0.5/scripts/find-perl-requires ---- rpm-3.0.5.orig/scripts/find-perl-requires Thu Jan 1 01:00:00 1970 -+++ rpm-3.0.5/scripts/find-perl-requires Sun Jul 30 00:07:06 2000 -@@ -0,0 +1,11 @@ -+#!/bin/sh -+ulimit -c 0 -+ -+filelist=`sed "s/['\"]/\\\&/g"` -+ -+requires="`echo $filelist|/usr/lib/rpm/find-requires`" -+requires_perl="`/usr/lib/rpm/perl.req $filelist`" -+requires_mod="`rpm -q --whatprovides --qf "%{NAME}\n" $requires_perl 2>/dev/null`" -+echo "$requires -+$requires_perl -+$requires_mod"| sort -u -diff -urN rpm-3.0.5.orig/scripts/perl.prov rpm-3.0.5/scripts/perl.prov ---- rpm-3.0.5.orig/scripts/perl.prov Wed Jun 14 14:34:50 2000 -+++ rpm-3.0.5/scripts/perl.prov Sun Jul 30 00:07:06 2000 -@@ -47,7 +47,9 @@ - - if ("@ARGV") { - foreach (@ARGV) { -- process_file($_); -+ if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod|h|html)$)=) { -+ process_file($_); -+ } - } - } else { - -@@ -55,7 +57,9 @@ - # contents of the file. - - foreach (<>) { -- process_file($_); -+ if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod|h|html)$)=) { -+ process_file($_); -+ } - } - } - -diff -urN rpm-3.0.5.orig/scripts/perl.req rpm-3.0.5/scripts/perl.req ---- rpm-3.0.5.orig/scripts/perl.req Wed Jun 14 14:34:50 2000 -+++ rpm-3.0.5/scripts/perl.req Sun Jul 30 00:07:06 2000 +diff -urN rpm-4.3.org/configure.ac rpm-4.3/configure.ac +--- rpm-4.3.org/configure.ac 2004-01-07 01:51:35.251160244 +0100 ++++ rpm-4.3/configure.ac 2004-01-07 01:55:53.198560246 +0100 +@@ -1196,6 +1196,7 @@ + AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3) + + AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec ++ scripts/perl.req scripts/perl.prov + rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile + scripts/Makefile scripts/brp-redhat + scripts/macros.perl scripts/macros.php scripts/macros.python +diff -urN rpm-4.3.org/scripts/perl.req rpm-4.3/scripts/perl.req +--- rpm-4.3.org/scripts/perl.req 2004-01-07 01:51:04.911464416 +0100 ++++ rpm-4.3/scripts/perl.req 2004-01-07 01:55:17.030076058 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -+#!@PERL@ ++#!@__PERL@ # RPM (and it's source code) is covered under two separate licenses. @@ -171,13 +56,13 @@ diff -urN rpm-3.0.5.orig/scripts/perl.req rpm-3.0.5/scripts/perl.req } else { # I am not using rpm3.0 so I do not want spaces arround my -@@ -183,7 +195,31 @@ +@@ -219,7 +231,31 @@ # will be included with the name sys/systeminfo.ph so only use the # basename of *.ph files -- ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g ); +- ($module =~ m/\.ph$/) && next; + # ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g ); -+ ++ + # there is no need to generate dependencies for ph, pl or test files + # so let's just skip them. + @@ -202,5 +87,5 @@ diff -urN rpm-3.0.5.orig/scripts/perl.req rpm-3.0.5/scripts/perl.req + + $module =~ s/\(\s*\)$//; - $require{$module}=$version; + $line{$module}=$_;