X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-perl-macros.patch;h=33923595dc3faba95bc080cd774915a947e57814;hb=ec981489a40c2d52307031add06983fdbad9f312;hp=3985ec63645ebe27d571e49a13d0068a26f3a7b8;hpb=2fa5aec3b104af0aecfda29321c47471b3bd1269;p=packages%2Frpm.git diff --git a/rpm-perl-macros.patch b/rpm-perl-macros.patch index 3985ec6..3392359 100644 --- a/rpm-perl-macros.patch +++ b/rpm-perl-macros.patch @@ -1,167 +1,130 @@ -diff -ruN rpm-3.0.3/macros.in rpm-3.0.3.new/macros.in ---- rpm-3.0.3/macros.in Sat Oct 30 11:59:36 1999 -+++ rpm-3.0.3.new/macros.in Sat Oct 30 11:24:39 1999 -@@ -248,6 +248,8 @@ - # %{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) -diff -ruN rpm-3.0.3/macros.perl.in rpm-3.0.3.new/macros.perl.in ---- rpm-3.0.3/macros.perl.in Thu Jan 1 01:00:00 1970 -+++ rpm-3.0.3.new/macros.perl.in Sat Oct 30 11:24:39 1999 -@@ -0,0 +1,11 @@ -+# 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) -+ -diff -ruN rpm-3.0.3/scripts/Makefile.am rpm-3.0.3.new/scripts/Makefile.am ---- rpm-3.0.3/scripts/Makefile.am Sat Jun 5 22:52:30 1999 -+++ rpm-3.0.3.new/scripts/Makefile.am Sat Oct 30 11:24:39 1999 -@@ -4,7 +4,8 @@ - - EXTRA_DIST = \ - convertrpmrc.sh find-lang.sh freshen.sh getpo.sh \ -- perl.prov perl.req vpkg-provides.sh -+ perl.prov perl.req find-perl-requires find-perl-provides \ -+ vpkg-provides.sh - - installprefix = $(DESTDIR) - -@@ -13,5 +14,6 @@ - configdir = ${prefix}/lib/rpm - config_SCRIPTS = \ - convertrpmrc.sh find-lang.sh freshen.sh getpo.sh \ -- perl.prov perl.req vpkg-provides.sh -+ perl.prov perl.req find-perl-requires find-perl-provides \ -+ vpkg-provides.sh - -diff -ruN rpm-3.0.3/scripts/find-perl-provides rpm-3.0.3.new/scripts/find-perl-provides ---- rpm-3.0.3/scripts/find-perl-provides Thu Jan 1 01:00:00 1970 -+++ rpm-3.0.3.new/scripts/find-perl-provides Sat Oct 30 11:24:39 1999 -@@ -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 -ruN rpm-3.0.3/scripts/find-perl-requires rpm-3.0.3.new/scripts/find-perl-requires ---- rpm-3.0.3/scripts/find-perl-requires Thu Jan 1 01:00:00 1970 -+++ rpm-3.0.3.new/scripts/find-perl-requires Sat Oct 30 11:24:39 1999 -@@ -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 -ruN rpm-3.0.3/scripts/perl.prov rpm-3.0.3.new/scripts/perl.prov ---- rpm-3.0.3/scripts/perl.prov Sat Jun 5 22:52:31 1999 -+++ rpm-3.0.3.new/scripts/perl.prov Sat Oct 30 11:24:39 1999 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!@PERL@ - - # a simple script to print the proper name for perl libraries. - -@@ -30,12 +30,12 @@ - if (length($require{$module}) == 0) { - print "perl($module)\n"; - } else { -- print "perl($module)=$require{$module}\n"; -+ print "perl($module) = $require{$module}\n"; - - # we need to print it without the version number until the - # requires syntax accepts version numbers correctly. - -- print "perl($module)\n"; -+# print "perl($module)\n"; - } - } - -diff -ruN rpm-3.0.3/scripts/perl.req rpm-3.0.3.new/scripts/perl.req ---- rpm-3.0.3/scripts/perl.req Sat Jun 5 22:52:31 1999 -+++ rpm-3.0.3.new/scripts/perl.req Sat Oct 30 11:50:03 1999 +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 +@@ -1313,6 +1313,7 @@ + Doxyfile Makefile macros rpmpopt rpm.spec + rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile + scripts/Makefile scripts/macros.perl scripts/macros.php ++ scripts/perl.req scripts/perl.prov + scripts/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 python/Makefile +--- rpm-4.4.9/scripts/perl.req.orig 2006-07-08 16:13:50.000000000 +0200 ++++ rpm-4.4.9/scripts/perl.req 2008-03-24 01:13:31.985544655 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -+#!@PERL@ ++#!@__PERL@ - # a simple makedepends like script for perl. + # RPM (and its source code) is covered under two separate licenses. -@@ -12,7 +12,11 @@ +@@ -41,7 +41,11 @@ if ("@ARGV") { foreach (@ARGV) { - process_file($_); -+ if (m=/usr/(bin|lib|share|X11R6/(lib|bin))/=) { -+ if (! m=(/((doc|man|info)|/usr/src)/)\.so$)=) { ++ if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) { ++ if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) { + process_file($_); + } + } } } else { -@@ -20,22 +24,30 @@ +@@ -49,7 +53,11 @@ # contents of the file. foreach (<>) { - process_file($_); -+ if (m=/usr/(bin|lib|share|X11R6/(lib|bin))/=) { -+ if (! m=(/((doc|man|info)|/usr/src)/)\.so$)=) { -+ process_file($_); -+ } -+ } - } - } - - - foreach $module (sort keys %require) { - if (length($require{$module}) == 0) { -- print "perl($module)\n"; -+ if ($module =~ /^[0-9._]+$/) { -+ print "perl >= $module\n"; -+ } else { -+ print "perl($module)\n"; -+ } - } else { - -- print "perl($module)>=$require{$module}\n"; -+ print "perl($module) >= $require{$module}\n"; - - # we need to print it without the version number until the - # requires syntax accepts version numbers correctly. - -- print "perl($module)\n"; -+# print "perl($module)\n"; ++ if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) { ++ if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) { ++ process_file($_); ++ } ++ } } } -@@ -54,7 +66,7 @@ - while () { - - # skip the documentation -- if ( (m/^=(head1|head2|pod)/) .. (m/^=(cut)/) ) { -+ if ( (m/^=(head1|head2|pod|item)/) .. (m/^=(cut)/) ) { - next; - } +@@ -203,19 +211,41 @@ + + $module =~ s/\(\s*\)$//; + +- if ( $module =~ m/^v?([0-9._]+)$/ ) { ++ if ( $module =~ m/^(v?)([0-9._]+)$/ ) { + # if module is a number then both require and use interpret that + # to mean that a particular version of perl is specified + +- my $ver=$1; +- if ($ver =~ /5.00/) { +- print "perl >= 0:$ver\n"; +- next; +- } +- else { +- print "perl >= 1:$ver\n"; +- next; +- } ++ my $ver=$2; ++ if (($1 eq 'v') or ($ver =~ /[0-9]+\.[0-9]+\.[0-9]+/)) { ++ # $V-style ++ if ($ver =~ m/5\.([0-5])(\.([0-9]+))?$/) { ++ if (defined $3) { ++ print "perl-base >= 0:5.00$1_$3\n"; ++ } else { ++ print "perl-base >= 0:5.00$1\n"; ++ } ++ } else { ++ print "perl-base >= 1:$ver\n"; ++ } ++ } else { ++ # $]-style ++ if ($ver =~ m/5\.(00[0-5])_?([0-9]+)?$/) { ++ if (defined $2) { ++ print "perl-base >= 0:5.$1_$2\n"; ++ } else { ++ print "perl-base >= 0:5.$1\n"; ++ } ++ } else { ++ # expand to M.NNN_nnn form ++ $ver =~ s/^([0-9])$/$1./; ++ $ver =~ s/^([0-9]\.[0-9]{0,5}|[0-9]\.[0-9]{3}_[0-9]{0,2})$/${1}000000/; ++ $ver =~ s/^([0-9]\.[0-9]{3})_?([0-9]{3})0*$/$1_$2/; ++ # match trimming leading 0s ++ $ver =~ m/^([0-9])\.0*([1-9][0-9]*|0)_0*([1-9][0-9]*|0)$/; ++ print "perl-base >= 1:$1.$2.$3\n"; ++ } ++ } ++ next; + + }; + +@@ -232,7 +262,31 @@ + # will be included with the name sys/systeminfo.ph so only use the + # basename of *.ph files + +- ($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. ++ ++ ($module =~ m/\.(ph|pl|t)$/) && next; ++ ++ # skip all modules for platforms other than linux. ++ ++ ($module =~ m/Mac|OS2|MSDOS|Win32|VMS|vmsish/) && next; ++ ++ # if the module name starts in a dot it is not a module name. ++ ++ ($module =~ m/^\./) && next; ++ ++ # if the module ends with .pm strip it to leave only basename. ++ ++ $module =~ s/\.pm$//; ++ ++ $module =~ s/\//::/; ++ ++ # trim off trailing parenthesis if any. Sometimes people pass ++ # the module an empty list. ++ ++ $module =~ s/\(\s*\)$//; + $require{$module}=$version; + $line{$module}=$_;