|
|
@@ -1,7 +1,6 @@
|
|
|
%define _noVersionedDependencies 1
|
|
|
%define threading 1
|
|
|
%define largefiles 1
|
|
|
-%define suidperl 1
|
|
|
|
|
|
%define multilib_64_archs x86_64 s390x ppc64 sparc64
|
|
|
%define perl_archname %{_arch}-%{_os}-thread-multi
|
|
|
@@ -12,7 +11,7 @@
|
|
|
%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.1
|
|
|
+%define perl_version 5.12.3
|
|
|
%define perlrel 1
|
|
|
%define perl_epoch 2
|
|
|
|
|
|
@@ -44,21 +43,12 @@ 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.bz2
|
|
|
-Source1: clean-manifest.pl
|
|
|
-Source5: MANIFEST.CPAN
|
|
|
-Source6: MANIFEST.CGI
|
|
|
-Source7: MANIFEST.DB_File
|
|
|
-Source9: MANIFEST.suidperl
|
|
|
+Source0: ftp://ftp.perl.org/pub/perl/CPAN/src/perl-%{perl_version}.tar.gz
|
|
|
Source10: system-owned-directories
|
|
|
Source11: filter-depends.sh
|
|
|
Source12: perl-5.8.0-libnet.cfg
|
|
|
-
|
|
|
-# Patch1: perl-5.6.0-installman.patch
|
|
|
-# Patch2: perl5.005_03-db1.patch
|
|
|
-# Patch3: perl-5.6.0-nodb.patch
|
|
|
+Patch1: perl-5.12.3-MANIFEST-gziped-Changes.patch
|
|
|
Patch4: perl-5.6.1-prereq.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
|
|
|
@@ -122,11 +112,11 @@ 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.1-USE_MM_LD_RUN_PATH.patch
|
|
|
+Patch1007: perl-5.12.3-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
|
|
|
+Patch1008: perl-5.12.3-disable_test_hosts.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
|
|
|
@@ -153,7 +143,10 @@ Provides: perl(VMS::Filespec)
|
|
|
Provides: perl(VMS::Stdio)
|
|
|
|
|
|
# Compat provides
|
|
|
-Provides: perl(:MODULE_COMPAT_5.10.0)
|
|
|
+Provides: perl(:MODULE_COMPAT_5.12.3)
|
|
|
+Provides: perl(:MODULE_COMPAT_5.12.2)
|
|
|
+Provides: perl(:MODULE_COMPAT_5.12.1)
|
|
|
+Provides: perl(:MODULE_COMPAT_5.12.0)
|
|
|
|
|
|
# Threading provides
|
|
|
Provides: perl(:WITH_ITHREADS)
|
|
|
@@ -242,7 +235,7 @@ Perl library directories in /usr/local
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-%patch5 -p1 -b .root
|
|
|
+%patch1 -p1
|
|
|
%patch13 -p1
|
|
|
|
|
|
%patch17 -p1 -b .sharedlinker
|
|
|
@@ -259,31 +252,31 @@ Perl library directories in /usr/local
|
|
|
%patch1008 -p1
|
|
|
%patch1010 -p1
|
|
|
|
|
|
+# Compress Changes* to save space
|
|
|
+%{__gzip} Changes*
|
|
|
+
|
|
|
#
|
|
|
# Candidates for doc recoding (need case by case review):
|
|
|
# find . -name "*.pod" -o -name "README*" -o -name "*.pm" | xargs file -i | grep charset= | grep -v '\(us-ascii\|utf-8\)'
|
|
|
recode()
|
|
|
{
|
|
|
- iconv -f "$2" -t utf-8 < "$1" > "${1}_"
|
|
|
+ iconv -f "${2:-iso-8859-1}" -t utf-8 < "$1" > "${1}_"
|
|
|
+ touch -r "$1" "${1}_"
|
|
|
mv -f "${1}_" "$1"
|
|
|
}
|
|
|
recode README.cn euc-cn
|
|
|
recode README.jp euc-jp
|
|
|
recode README.ko euc-kr
|
|
|
recode README.tw big5
|
|
|
-recode pod/perlebcdic.pod iso-8859-1
|
|
|
-recode pod/perlhack.pod iso-8859-1
|
|
|
-recode pod/perlhist.pod iso-8859-1
|
|
|
-recode pod/perlothrtut.pod iso-8859-1
|
|
|
-recode pod/perlthrtut.pod iso-8859-1
|
|
|
-recode lib/Unicode/Collate.pm iso-8859-1
|
|
|
-for i in Changes*; do
|
|
|
- recode $i iso-8859-1
|
|
|
-done
|
|
|
-recode AUTHORS iso-8859-1
|
|
|
+recode pod/perlebcdic.pod
|
|
|
+recode pod/perlhack.pod
|
|
|
+recode pod/perlhist.pod
|
|
|
+recode pod/perlthrtut.pod
|
|
|
+recode AUTHORS
|
|
|
|
|
|
find . -name \*.orig -exec rm -fv {} \;
|
|
|
|
|
|
+
|
|
|
# Oh, the irony. Perl generates some non-versioned provides we don't need.
|
|
|
# Each of these has a versioned provide, which we keep.
|
|
|
cat << EOF > perl-prov
|
|
|
@@ -307,9 +300,11 @@ 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|
|
|
|
+ s|INCLUDE = ./zlib-src|INCLUDE = %{_includedir}|
|
|
|
+ s|LIB = ./zlib-src|LIB = %{_libdir}|' \
|
|
|
+ cpan/Compress-Raw-Zlib/config.in
|
|
|
+
|
|
|
|
|
|
%build
|
|
|
# for generating makefiles
|
|
|
@@ -352,7 +347,6 @@ echo "RPM Build arch: %{_arch}"
|
|
|
-Dusethreads \
|
|
|
-Duseithreads \
|
|
|
-Duselargefiles \
|
|
|
- -Dd_dosuid \
|
|
|
-Dd_semctl_semun \
|
|
|
-Di_db \
|
|
|
-Ui_ndbm \
|
|
|
@@ -438,12 +432,12 @@ find $RPM_BUILD_ROOT -name '*NDBM*' | xargs rm -rfv
|
|
|
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -empty -exec rm -f {} ';'
|
|
|
|
|
|
# Install sample cgi scripts (this used to happen automatically?)
|
|
|
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/perl5/%{perl_version}/CGI/eg/
|
|
|
-cp -a lib/CGI/eg/* $RPM_BUILD_ROOT/%{_libdir}/perl5/%{perl_version}/CGI/eg/
|
|
|
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/perl5/%{perl_version}/CGI/examples/
|
|
|
+cp -a cpan/CGI/examples/* $RPM_BUILD_ROOT/%{_libdir}/perl5/%{perl_version}/CGI/examples/
|
|
|
|
|
|
# Cleanup binary paths and make cgi files executable
|
|
|
-pushd $RPM_BUILD_ROOT/%{_libdir}/perl5/%{perl_version}/CGI/eg/
|
|
|
- for i in *.cgi make_links.pl RunMeFirst ; do
|
|
|
+pushd $RPM_BUILD_ROOT/%{_libdir}/perl5/%{perl_version}/CGI/examples/
|
|
|
+ for i in *.cgi make_links.pl ; do
|
|
|
sed -i 's|/usr/local/bin/perl|%{_bindir}/perl|g' $i
|
|
|
chmod +x $i
|
|
|
done
|
|
|
@@ -467,9 +461,6 @@ popd
|
|
|
|
|
|
chmod -R u+w $RPM_BUILD_ROOT/*
|
|
|
|
|
|
-# Compress Changes* to save space
|
|
|
-%{__gzip} Changes*
|
|
|
-
|
|
|
# for localdirs
|
|
|
%{__mkdir_p} %{buildroot}%{_prefix}/local/lib/site_perl/%{perl_version}/%{_arch}-%{_os}%{thread_arch}
|
|
|
|
|
|
@@ -519,6 +510,27 @@ make test
|
|
|
%dir %{_prefix}/local/lib/site_perl/%{perl_version}/%{_arch}-%{_os}%{thread_arch}
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Mar 18 2011 IWAI, Masaharu <iwai@alib.jp> 5.12.3-1
|
|
|
+- new upstream release
|
|
|
+- drop MANIFEST files:
|
|
|
+ - clean-manifest.pl (Source1)
|
|
|
+ - MANIFEST.CPAN (Source5)
|
|
|
+ - MANIFEST.CGI (Source6)
|
|
|
+ - MANIFEST.DB_File (Source7)
|
|
|
+ - MANIFEST.suidperl (Source9)
|
|
|
+- suidperl isn't created by upstream since 5.12.0
|
|
|
+ - update Configure option
|
|
|
+- update Compat provides
|
|
|
+- drop root patch (Patch5)
|
|
|
+- update patches: from Fedora 5.12.3-154.fc16
|
|
|
+ - USE_MM_LD_RUN_PATH patch (Patch1007)
|
|
|
+ - disable_test_hosts patch (Patch1008)
|
|
|
+- update recode script and recode target files: sync Fedora 5.12.3-154.fc16
|
|
|
+- update using system zlib configuration code for Compress::ZLib
|
|
|
+- execute gzip Changes in %%prep: moved in %%build
|
|
|
+- add MANIFEST patch (Patch1): for gziped Changes
|
|
|
+- update installing CGI example scripts routine
|
|
|
+
|
|
|
* Tue Mar 8 2011 IWAI, Masaharu <iwai@alib.jp> 5.10.1-1
|
|
|
- new upstream release
|
|
|
- build with current db4: fix <BTS:VineLinux:1084>
|
iwaim