---- rpm-3.0.3/scripts/Makefile.am.wiget Sat Jun 5 22:52:30 1999
-+++ rpm-3.0.3/scripts/Makefile.am Sat Oct 30 12:28:50 1999
-@@ -4,7 +4,8 @@
+diff -Nru rpm-4.0.1/configure.in rpm-4.0.1.new/configure.in
+--- rpm-4.0.1/configure.in Wed Jan 31 13:37:21 2001
++++ rpm-4.0.1.new/configure.in Wed Jan 31 13:49:25 2001
+@@ -185,6 +185,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`
- 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
+@@ -1043,6 +1044,7 @@
- installprefix = $(DESTDIR)
+ AC_CONFIG_SUBDIRS(popt)
+ AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt rpm.spec scripts/brp-redhat
++ macros.perl scripts/perl.req scripts/perl.prov
+ rpmio/Makefile lib/Makefile build/Makefile tools/Makefile
+ scripts/Makefile
+ tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
+diff -Nru rpm-4.0.1/macros.in rpm-4.0.1.new/macros.in
+--- rpm-4.0.1/macros.in Wed Jan 31 13:37:21 2001
++++ rpm-4.0.1.new/macros.in Wed Jan 31 13:38:04 2001
+@@ -629,9 +629,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)
-@@ -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
-
---- rpm-3.0.3/scripts/find-perl-provides.wiget Sat Oct 30 12:28:50 1999
-+++ rpm-3.0.3/scripts/find-perl-provides Sat Oct 30 12:28:50 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
-+
---- rpm-3.0.3/scripts/find-perl-requires.wiget Sat Oct 30 12:28:50 1999
-+++ rpm-3.0.3/scripts/find-perl-requires Sat Oct 30 12:28:50 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
---- rpm-3.0.3/scripts/perl.prov.wiget Sat Jun 5 22:52:31 1999
-+++ rpm-3.0.3/scripts/perl.prov Sat Oct 30 12:28:50 1999
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!@PERL@
+ #------------------------------------------------------------------------------
+ # arch macro for all Intel i?86 compatibile processors
+diff -Nru rpm-4.0.1/scripts/Makefile.am rpm-4.0.1.new/scripts/Makefile.am
+--- rpm-4.0.1/scripts/Makefile.am Wed Jan 31 13:37:21 2001
++++ rpm-4.0.1.new/scripts/Makefile.am Wed Jan 31 14:27:28 2001
+@@ -9,7 +9,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 \
+- trpm u_pkg.sh vpkg-provides.sh vpkg-provides2.sh
++ trpm u_pkg.sh vpkg-provides.sh vpkg-provides2.sh \
++ find-perl-requires find-perl-provides
- # a simple script to print the proper name for perl libraries.
+ installprefix = $(DESTDIR)
-@@ -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";
+@@ -23,4 +24,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 -Nru rpm-4.0.1/scripts/perl.prov rpm-4.0.1.new/scripts/perl.prov
+--- rpm-4.0.1/scripts/perl.prov Wed Jan 31 13:37:21 2001
++++ rpm-4.0.1.new/scripts/perl.prov Wed Jan 31 13:38:04 2001
+@@ -47,7 +47,9 @@
- # we need to print it without the version number until the
- # requires syntax accepts version numbers correctly.
+ if ("@ARGV") {
+ foreach (@ARGV) {
+- process_file($_);
++ if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod|h|html)$)=) {
++ process_file($_);
++ }
+ }
+ } else {
-- print "perl($module)\n";
-+# print "perl($module)\n";
+@@ -55,7 +57,9 @@
+ # contents of the file.
+
+ foreach (<>) {
+- process_file($_);
++ if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod|h|html)$)=) {
++ process_file($_);
++ }
}
}
---- rpm-3.0.3/scripts/perl.req.wiget Sat Jun 5 22:52:31 1999
-+++ rpm-3.0.3/scripts/perl.req Sat Oct 30 12:34:07 1999
+diff -Nru rpm-4.0.1/scripts/perl.req rpm-4.0.1.new/scripts/perl.req
+--- rpm-4.0.1/scripts/perl.req Wed Jan 31 13:37:21 2001
++++ rpm-4.0.1.new/scripts/perl.req Wed Jan 31 13:38:04 2001
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
- # a simple makedepends like script for perl.
+ # RPM (and it's 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,32 @@
+@@ -49,14 +53,22 @@
# contents of the file.
foreach (<>) {
- process_file($_);
-+ if (m=/usr/(bin|lib|share|X11R6/(lib|bin))/=) {
-+ if (! m=(/((doc|man|info)|/usr/src)/)\.(so|pl|ph)$)=) {
-+ process_file($_);
-+ }
-+ }
++ if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
++ if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
++ 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 {
-+ if ($module !~ /\.ph$/ && $module !~ /\.pl/) {
-+ 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.
+ # I am not using rpm3.0 so I do not want spaces arround my
+@@ -183,7 +195,31 @@
+ # will be included with the name sys/systeminfo.ph so only use the
+ # basename of *.ph files
-- print "perl($module)\n";
-+# print "perl($module)\n";
- }
- }
-
-@@ -54,7 +68,7 @@
- while (<FILE>) {
-
- # skip the documentation
-- if ( (m/^=(head1|head2|pod)/) .. (m/^=(cut)/) ) {
-+ if ( (m/^=(head1|head2|pod|item)/) .. (m/^=(cut)/) ) {
- next;
- }
-
---- rpm-3.0.3/macros.in.wiget Sat Oct 30 12:28:50 1999
-+++ rpm-3.0.3/macros.in Sat Oct 30 12:28:50 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)
---- rpm-3.0.3/macros.perl.in.wiget Sat Oct 30 12:28:50 1999
-+++ rpm-3.0.3/macros.perl.in Sat Oct 30 12:28:50 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
+- ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g );
++ # ($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.
+
-+%define __find_requires @RPMCONFIGDIR@/find-perl-requires
-+%define __find_provides @RPMCONFIGDIR@/find-perl-provides
++ ($module =~ m/Mac|OS2|MSDOS|Win32|VMS|vmsish/) && next;
+
-+%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)
++ # if the module name starts in a dot it is not a module name.
+
---- rpm-3.0.3/configure.in.wiget Sat Oct 30 12:28:50 1999
-+++ rpm-3.0.3/configure.in Sat Oct 30 12:28:50 1999
-@@ -181,6 +181,7 @@
- AC_MSG_RESULT(patch later then 2.2 found)
- fi
++ ($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*\)$//;
-+ AC_PATH_PROG(PERL, perl, /usr/bin/perl, $MYPATH)
- AC_PATH_PROG(PGPBIN, pgp, /usr/bin/pgp, $MYPATH)
- AC_PATH_PROG(__RM, rm, /bin/rm, $MYPATH)
- AC_PATH_PROG(__TAR, tar, /bin/tar, $MYPATH)
-@@ -907,7 +908,8 @@
- AC_CONFIG_SUBDIRS(popt)
- AC_OUTPUT([Makefile rpmrc macros macros.pld lib/Makefile
-- build/Makefile tools/Makefile scripts/Makefile
-+ build/Makefile tools/Makefile
-+ scripts/Makefile scripts/perl.req scripts/perl.prov
- tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
- misc/Makefile po/Makefile.in intl/Makefile
- doc/Makefile doc/manual/Makefile doc/pl/Makefile doc/ru/Makefile
+ $require{$module}=$version;
projects / packages / rpm.git / blobdiff