Browse Source

perl 5.10.1-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2976 ec354946-7b23-47d6-9f5a-488ba84defc7
iwaim 13 years ago
parent
commit
52dedecbbb
2 changed files with 35 additions and 41 deletions
  1. 3 0
      p/perl/filter-depends.sh
  2. 32 41
      p/perl/perl-vl.spec

+ 3 - 0
p/perl/filter-depends.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/lib/rpm/perl.req $* | grep -v 'perl(VMS::Filespec)' | grep -v 'perl(VMS::Stdio)' | grep -v 'perl(Your::Module::Here)' | grep -v 'perl(FCGI)' | grep -v 'perl(Mac::BuildTools)' | grep -v 'perl(Mac::InternetConfig)' | grep -v 'perl(Tk)' | grep -v 'perl(Tk::Pod)' | grep -v 'perl(DBIx::Simple)' |grep -v 'perl(Log::Message::Handlers)'

+ 32 - 41
p/perl/perl-vl.spec

@@ -12,8 +12,8 @@
 %define new_perl_flags LD_PRELOAD=/%{new_arch_lib}/CORE/libperl.so LD_LIBRARY_PATH=%{new_arch_lib}/CORE PERL5LIB=%{new_perl_lib}:%{comp_perl_lib}
 %define new_perl %{new_perl_flags} $RPM_BUILD_ROOT/%{_bindir}/perl
 
-%define perl_version 5.10.0
-%define perlrel 9
+%define perl_version 5.10.1
+%define perlrel 1
 %define perl_epoch 2
 
 Provides: perl(:WITH_PERLIO)
@@ -44,7 +44,7 @@ Epoch:        %{perl_epoch}
 License:      Artistic or GPL
 Group:        Development/Languages
 Url:	      http://www.perl.org/
-Source0: ftp://ftp.perl.org/pub/perl/CPAN/src/perl-%{perl_version}.tar.gz
+Source0: ftp://ftp.perl.org/pub/perl/CPAN/src/perl-%{perl_version}.tar.bz2
 Source1: clean-manifest.pl
 Source5: MANIFEST.CPAN
 Source6: MANIFEST.CGI
@@ -58,7 +58,7 @@ Source12: perl-5.8.0-libnet.cfg
 # Patch2: perl5.005_03-db1.patch
 # Patch3: perl-5.6.0-nodb.patch
 Patch4: perl-5.6.1-prereq.patch
-Patch5: perl-5.8.1-root.patch
+Patch5: perl-5.10.1-root.patch
 Patch6: perl-5.8.0-fhs.patch
 Patch7: perl-5.6.0-buildroot.patch
 #Patch8: perl-5.8.0-errno.patch
@@ -67,7 +67,7 @@ Patch9: perl-5.7.3-syslog.patch
 ## from Fedora Core perl-5.8.5-9
 Patch13: perl-5.8.3-perlbug-tag.patch
 
-%define __find_requires %{SOURCE11}
+%define __perl_requires %{SOURCE11}
 
 Conflicts: perl-NDBM_File <= 1:1.75-34.99.6
 
@@ -122,47 +122,26 @@ Patch101: perl-5.8.0-libdir64.patch
 Patch1006:         perl-5.8.6-libresolv.patch
 
 # FIXME: May need the "Fedora" references removed before upstreaming
-Patch1007:         perl-5.10.0-USE_MM_LD_RUN_PATH.patch
+Patch1007:         perl-5.10.1-USE_MM_LD_RUN_PATH.patch
 
 # Skip hostname tests, since hostname lookup isn't available in Fedora
 # buildroots by design.
 Patch1008:         perl-5.10.0-disable_test_hosts.patch
 
-# Bump Sys::Syslog to 0.27 to fix select timeout bug
-# https://bugzilla.redhat.com/show_bug.cgi?id=492422
-Patch1009:         perl-5.10.0-SysSyslog-0.27.patch
-
 # The Fedora builders started randomly failing this futime test
 # only on x86_64, so we just don't run it. Works fine on normal
 # systems.
 Patch1010:        perl-5.10.0-x86_64-io-test-failure.patch
 
-# http://public.activestate.com/cgi-bin/perlbrowse/p/32891
-Patch1011:        32891.patch
-
-# Update Module::Load::Conditional to 0.24 for clean upgrade
-Patch1012:	perl-5.10.0-Module-Load-Conditional-0.24.patch
-
-# Upgrade Module::CoreList to 2.14
-Patch1013:	perl-5.10.0-Module-CoreList2.14.patch
-
-# Fix from Archive::Extract maintainer to only look at stdout
-# We need this because we're using tar >= 1.21
-# included upstream in 0.31_03
-Patch1014:        perl-5.10.0-Archive-Extract-onlystdout.patch
-
-# Update Module:Compress::Raw::Zlib (CVE-2009-1391)
-Patch1015: perl-update-Compress_Raw_Zlib.patch
-
 Buildroot:    %{_tmppath}/%{name}-%{version}-root
-BuildPreReq:  gawk, grep, tcsh, gdbm-devel, db4-devel
-BuildPreReq:  rpm-devel, gpm-devel, ncurses-devel, zlib-devel, netpbm-devel
-BuildPreReq:  libpng-devel, libtiff-devel, libelf, libjpeg-devel
-BuildPreReq:  netpbm-devel, e2fsprogs-devel
+BuildRequires:  gawk, grep, tcsh, gdbm-devel, db4-devel
+BuildRequires:  rpm-devel, gpm-devel, ncurses-devel, zlib-devel, netpbm-devel
+BuildRequires:  libpng-devel, libtiff-devel, libelf, libjpeg-devel
+BuildRequires:  netpbm-devel, e2fsprogs-devel
 
 # without man installed, the variables installman[13]dir
 # in Config.pm will be undefined. This BuildPreReq will fix it.
-BuildPreReq:  man
+BuildRequires:  man
 
 Vendor:       Project Vine
 Distribution: Vine Linux
@@ -278,13 +257,7 @@ Perl library directories in /usr/local
 %patch1006 -p1
 %patch1007 -p1
 %patch1008 -p1
-%patch1009 -p1
 %patch1010 -p1
-%patch1011 -p1
-%patch1012 -p1
-%patch1013 -p1
-%patch1014 -p1
-%patch1015 -p1 -b .CVE-2009-1391
 
 #
 # Candidates for doc recoding (need case by case review):
@@ -334,9 +307,9 @@ EOF
 chmod +x %{__perl_provides}
 
 # Configure Compress::Zlib to use system zlib
-sed -i "s|BUILD_ZLIB      = True|BUILD_ZLIB      = False|" ext/Compress/Raw/Zlib/config.in
-sed -i "s|INCLUDE         = ./zlib-src|INCLUDE         = %{_includedir}|" ext/Compress/Raw/Zlib/config.in
-sed -i "s|LIB             = ./zlib-src|LIB             = %{_libdir}|" ext/Compress/Raw/Zlib/config.in
+sed -i "s|BUILD_ZLIB      = True|BUILD_ZLIB      = False|" ext/Compress-Raw-Zlib/config.in
+sed -i "s|INCLUDE         = ./zlib-src|INCLUDE         = %{_includedir}|" ext/Compress-Raw-Zlib/config.in
+sed -i "s|LIB             = ./zlib-src|LIB             = %{_libdir}|" ext/Compress-Raw-Zlib/config.in
 
 %build
 # for generating makefiles
@@ -546,6 +519,24 @@ make test
 %dir %{_prefix}/local/lib/site_perl/%{perl_version}/%{_arch}-%{_os}%{thread_arch}
 
 %changelog
+* Tue Mar  8 2011 IWAI, Masaharu <iwai@alib.jp> 5.10.1-1
+- new upstream release
+- build with current db4: fix <BTS:VineLinux:1084>
+- replace deprecated tag: BuildPreReq to BuildRequires
+- update root patch (Patch5)
+- update USE_MM_LD_RUN_PATH patch (Patch1007)
+- drop unnecessary patches: upstrem fixed
+  - Sys::Syslog upgrade patch (Patch1009)
+  - Patch1011
+  - Module::Load::Conditional upgrade patch (Patch1012)
+  - Module::CoreList upgrade patch (Patch1013)
+  - Archive::Extract upgrade patch (Patch1014)
+  - Compress::Raw::Zlib upgrade patch (Patch1015)
+- update using system zlib configuration code for Compress::ZLib
+- using __perl_requires for rpm-4.8
+- update filter-depends.sh (Source11)
+  - using __perl_requires
+
 * Sun Jun 27 2010 IWAI, Masaharu <iwai@alib.jp> 5.10.0-9
 - add Requires: nss: fix <BTS:VineLinux:1008>