diff --git a/perl-5.10.0.dif b/perl-5.10.0.dif index ac16077..d740a45 100644 --- a/perl-5.10.0.dif +++ b/perl-5.10.0.dif @@ -564,3 +564,89 @@ print SENDMAIL "\n\n"; open(REP, "<$filename") or die "Couldn't open `$filename': $!\n"; while () { print SENDMAIL $_ } +--- ./lib/CPAN.pm 2007-12-18 11:47:07.000000000 +0100 ++++ ./lib/CPAN.pm 2008-02-19 11:57:36.000000000 +0100 +@@ -43,7 +43,7 @@ + } + no lib "."; + +-require Mac::BuildTools if $^O eq 'MacOS'; ++#require Mac::BuildTools if $^O eq 'MacOS'; + $ENV{PERL5_CPAN_IS_RUNNING}=$$; + $ENV{PERL5_CPANPLUS_IS_RUNNING}=$$; # https://rt.cpan.org/Ticket/Display.html?id=23735 + +@@ -1647,7 +1647,7 @@ + $File::Find::prune++ if $CPAN::Signal; + return if -l $_; + if ($^O eq 'MacOS') { +- require Mac::Files; ++ #require Mac::Files; + my $cat = Mac::Files::FSpGetCatInfo($_); + $Du += $cat->ioFlLgLen() + $cat->ioFlRLgLen() if $cat; + } else { +--- ./lib/File/Spec/VMS.pm 2007-12-18 11:47:07.000000000 +0100 ++++ ./lib/File/Spec/VMS.pm 2008-02-19 12:02:21.000000000 +0100 +@@ -11,6 +11,8 @@ + use File::Basename; + use VMS::Filespec; + ++our $RPM_Ignore_Requires = "perl(VMS::Filespec)"; ++ + =head1 NAME + + File::Spec::VMS - methods for VMS file specs +--- ./lib/Net/Config.pm 2007-12-18 11:47:07.000000000 +0100 ++++ ./lib/Net/Config.pm 2008-02-19 11:57:58.000000000 +0100 +@@ -37,7 +37,7 @@ + # Try to get as much configuration info as possible from InternetConfig + # + $^O eq 'MacOS' and eval < sub { + return << "."; +--- ./lib/File/Temp.pm 2007-12-18 11:47:07.000000000 +0100 ++++ ./lib/File/Temp.pm 2008-02-19 15:44:25.000000000 +0100 +@@ -142,7 +142,7 @@ + use Fcntl 1.03; + use IO::Seekable; # For SEEK_* + use Errno; +-require VMS::Stdio if $^O eq 'VMS'; ++#require VMS::Stdio if $^O eq 'VMS'; + + # pre-emptively load Carp::Heavy. If we don't when we run out of file + # handles and attempt to call croak() we get an error message telling +--- ./lib/CGI/Fast.pm 2007-12-18 11:47:07.000000000 +0100 ++++ ./lib/CGI/Fast.pm 2008-02-19 18:16:19.000000000 +0100 +@@ -19,6 +19,9 @@ + use FCGI; + @ISA = ('CGI'); + ++# FCGI is missing from the perl distri ++our $RPM_Ignore_Requires = "perl(FCGI)"; ++ + # workaround for known bug in libfcgi + while (($ignore) = each %ENV) { } + diff --git a/perl.changes b/perl.changes index c7014ab..09fa584 100644 --- a/perl.changes +++ b/perl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 11 20:31:18 CET 2008 - coolo@suse.de + +- after several discussions on how to decrease size of perl + distribution: split out perl-doc +- preparing blacklists for temporarly autorequires + ------------------------------------------------------------------- Mon Mar 10 13:20:38 CET 2008 - pth@suse.de diff --git a/perl.spec b/perl.spec index baa9388..c6b124d 100644 --- a/perl.spec +++ b/perl.spec @@ -16,7 +16,7 @@ Name: perl Url: http://www.perl.org/ BuildRequires: db-devel gdbm-devel ncurses-devel zlib-devel Version: 5.10.0 -Release: 16 +Release: 18 Summary: The Perl interpreter License: Artistic License; GPL v2 or later Group: Development/Languages/Perl @@ -27,6 +27,7 @@ Provides: perl-Compress-Zlib perl-Compress-Raw-Zlib perl-IO-Compress-Base Obsoletes: perl-Compress-Zlib perl-Compress-Raw-Zlib perl-IO-Compress-Base perl-IO-Compress-Zlib perl-Archive-Tar perl-Module-Build perl-Locale-Maketext-Simple perl-Module-Pluggable perl-Pod-Escapes perl-Pod-Simple Provides: perl-version perl-IO-Zlib perl-ExtUtils-ParseXS Obsoletes: perl-version perl-IO-Zlib perl-ExtUtils-ParseXS +Recommends: perl-doc = %version #Requires: gzip # needed in SuSEconfig.perl PreReq: perl-base = %version #PreReq: %fillup_prereq @@ -77,6 +78,21 @@ itself. +Authors: +-------- + Larry Wall, Louis J. LaBash, Jr. + +%package doc +Group: Development/Languages/Perl +Summary: Perl Documentation +Requires: perl = %{version} +Provides: perl:/usr/share/man/man3/CORE.3pm.gz + +%description doc +Perl man pages and pod files. + + + Authors: -------- Larry Wall, Louis J. LaBash, Jr. @@ -134,18 +150,23 @@ install -m 444 saveConfig_heavy.pl $cpa/Config_heavy.pl #install -m 755 SuSE/perllocal.SuSE $RPM_BUILD_ROOT/usr/lib/perl5 #install -m 755 SuSE/SuSEconfig.perl $RPM_BUILD_ROOT/sbin/conf.d #install -m 755 SuSE/sysconfig.suseconfig-perl $RPM_BUILD_ROOT/var/adm/fillup-templates -for d in . sys linux asm* bits gnu net netinet db4 rpc arpa; do -( cd /usr/include - for f in $d/*.h ; do test "$f" != "$d/*.h" && $RPM_BUILD_ROOT/usr/bin/perl -I$cp -I$cpa $RPM_BUILD_ROOT/usr/bin/h2ph -d $vpa $f || : ; done -) +( rpm -ql glibc-devel | fgrep '.h' + find /usr/include/asm/ -name *.h + find /usr/include/asm-generic -name *.h +) | while read f; do + $RPM_BUILD_ROOT/usr/bin/perl -I$cp -I$cpa $RPM_BUILD_ROOT/usr/bin/h2ph -d $vpa $f || : done d="`gcc -print-file-name=include`" test -f "$d/stdarg.h" && (cd $d ; $RPM_BUILD_ROOT/usr/bin/perl -I$cp -I$cpa $RPM_BUILD_ROOT/usr/bin/h2ph -d $vpa stdarg.h stddef.h float.h) +# remove broken pm - we don't have the module +rm $RPM_BUILD_ROOT/usr/lib/perl5/*/Pod/Perldoc/ToTk.pm +# we don't need this in here +rm $RPM_BUILD_ROOT/usr/lib/perl5/*/*/CORE/libperl.a #touch $RPM_BUILD_ROOT/usr/share/man/man3/perllocal.3pm #touch $cpa/perllocal.pod # test CVE-2007-5116 $RPM_BUILD_ROOT/usr/bin/perl -e '$r=chr(128)."\\x{100}";/$r/' -%if 0 +%if 1 # remove unrelated target/os manpages rm $RPM_BUILD_ROOT/usr/share/man/man1/perlaix.1* rm $RPM_BUILD_ROOT/usr/share/man/man1/perlamiga.1* @@ -277,17 +298,30 @@ cat perl-base-filelist | sed -e 's/^/%exclude /g' > perl-base-excludes %exclude /usr/bin/perl %exclude /usr/bin/perl%version %exclude /usr/bin/suidperl -%exclude /usr/share/man/man1/perl.1.gz +%exclude /usr/lib/perl5/*/pod +%exclude /usr/lib/perl5/*/Unicode/*/*.txt +%exclude /usr/lib/perl5/*/unicore/*.txt /usr/bin/* /usr/lib/perl5/* -%doc /usr/share/man/man1/* -%doc /usr/share/man/man3/* #/sbin/conf.d/SuSEconfig.perl #/var/adm/fillup-templates/sysconfig.suseconfig-perl #%ghost /usr/lib/perl*/*/*/perllocal.pod #%ghost %doc /usr/share/man/man3/perllocal.3pm.gz +%files doc +%defattr(-,root,root) +%exclude /usr/share/man/man1/perl.1.gz +%doc /usr/share/man/man1/* +%doc /usr/share/man/man3/* +%doc /usr/lib/perl5/*/pod +%doc /usr/lib/perl5/*/Unicode/*/*.txt +%doc /usr/lib/perl5/*/unicore/*.txt + %changelog +* Tue Mar 11 2008 coolo@suse.de +- after several discussions on how to decrease size of perl + distribution: split out perl-doc +- preparing blacklists for temporarly autorequires * Mon Mar 10 2008 pth@suse.de - Fix call to dbmclose in ext/ODBM_File/ODBM_File.xs - Run 'make check' in %%check