From 108039af6c860d1518e02b4d01e01cc9168246e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 29 Apr 2011 11:39:00 +0200 Subject: [PATCH 01/13] Global macros file are updated to work with rpm4.9 Definition taken from: http://rpm.org/wiki/PackagerDocs/DependencyGenerator --- macros.perl | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/macros.perl b/macros.perl index 436c49e..9ba91e9 100644 --- a/macros.perl +++ b/macros.perl @@ -4,6 +4,7 @@ # rpm core; but won't cause a build to fail if they're not present. # # Chris Weyl 2009 +# Marcela Mašláňová 2011 # This macro unsets several common vars used to control how Makefile.PL (et # al) build and install packages. We also set a couple to help some of the @@ -27,7 +28,11 @@ export PERL_MM_USE_DEFAULT=1 # keep track of what "revision" of the filtering we're at. Each time we # change the filter we should increment this. -%perl_default_filter_revision 2 +%perl_default_filter_revision 3 + +# Perl provides/requeries are generated by external generators. +%global __perl_provides /usr/lib/rpm/perl.prov +%global __perl_requires /usr/lib/rpm/perl.req # By default, for perl packages we want to filter all files in _docdir from # req/prov scanning, as well as filtering out any provides caused by private @@ -37,10 +42,8 @@ export PERL_MM_USE_DEFAULT=1 # "%{?perl_default_filter}", before any %description block. %perl_default_filter %{?filter_setup: %{expand: \ -%filter_provides_in %{perl_vendorarch}/.*\\.so$ \ -%filter_provides_in -P %{perl_archlib}/(?!CORE/libperl).*\\.so$ \ -%filter_provides_in %{_docdir} \ -%filter_requires_in %{_docdir} \ +%define __provides_exclude_from (%{_perl_vendorarch}\/auto\/*|%{perl_archlib}/(?!CORE/libperl).*)\.so*|%{_docdir} \ +%define __requires_exclude_from %{_docdir} \ %filter_setup \ }} From 43e2287e32efffc736c40d619c02efaa84cd6413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 29 Apr 2011 11:40:11 +0200 Subject: [PATCH 02/13] Update to 5.14.0.RC1 - release candidate 1! - build RC1 of 5.14.0 - remove Class::ISA from sub-packages - patches 8+ are part of new release - remove vendorarch/auto/Compress/Zlib - update version releases in sub-packages --- perl.spec | 172 ++++++++++++++++++++---------------------------------- 1 file changed, 63 insertions(+), 109 deletions(-) diff --git a/perl.spec b/perl.spec index 09f9f9f..1d8445f 100644 --- a/perl.spec +++ b/perl.spec @@ -1,4 +1,4 @@ -%global perl_version 5.12.3 +%global perl_version 5.14.0 %global perl_epoch 4 %global perl_arch_stem -thread-multi %global perl_archname %{_arch}-%{_os}%{perl_arch_stem} @@ -20,7 +20,7 @@ Name: perl Version: %{perl_version} # release number must be even higher, becase dual-lived modules will be broken otherwise -Release: 160%{?dist} +Release: 161%{?dist} Epoch: %{perl_epoch} Summary: Practical Extraction and Report Language Group: Development/Languages @@ -32,7 +32,7 @@ Group: Development/Languages # Copyright Only: for example ext/Text-Soundex/Soundex.xs License: (GPL+ or Artistic) and (GPLv2+ or Artistic) and Copyright Only and MIT and Public Domain and UCD Url: http://www.perl.org/ -Source0: http://www.cpan.org/src/5.0/perl-%{perl_version}.tar.gz +Source0: http://www.cpan.org/src/5.0/perl-%{perl_version}-RC1.tar.bz2 Source2: perl-5.8.0-libnet.cfg Source3: macros.perl #Systemtap tapset and example that make use of systemtap-sdt-devel @@ -63,21 +63,6 @@ Patch6: perl-disable_test_hosts.patch # systems. Patch7: perl-5.10.0-x86_64-io-test-failure.patch -# Do not leak when destroying thread; RT #77352, RHBZ #630667 -Patch8: perl-5.12.1-fix_thread_leak.patch - -# h2ph produces incorrect code in preamble, based mainly on RT #74614 -Patch9: perl-5.12.2-h2ph.patch - -# Update some of the bundled modules -# see http://fedoraproject.org/wiki/Perl/perl.spec for instructions - -# Update ExtUtils::ParseXS to 2.2206 -Patch10: perl-ExtUtils-ParseXS-2.2206.patch - -# 692900 - lc launders tainted flag, RT #87336 -Patch11: perl-87336-lc-uc-first-fail-to-taint-the-returned-st.patch - # Update some of the bundled modules # see http://fedoraproject.org/wiki/Perl/perl.spec for instructions @@ -93,6 +78,7 @@ Provides: perl(VMS::Filespec) Provides: perl(VMS::Stdio) # Compat provides +Provides: perl(:MODULE_COMPAT_5.14.0) Provides: perl(:MODULE_COMPAT_5.12.3) Provides: perl(:MODULE_COMPAT_5.12.2) Provides: perl(:MODULE_COMPAT_5.12.1) @@ -215,7 +201,7 @@ Group: Development/Libraries License: GPL+ or Artistic # Epoch bump for clean upgrade over old standalone package Epoch: 1 -Version: 0.38 +Version: 0.48 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} BuildArch: noarch @@ -228,7 +214,7 @@ Summary: A module for Perl manipulation of .tar files Group: Development/Libraries License: GPL+ or Artistic Epoch: 0 -Version: 1.54 +Version: 1.76 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} Requires: perl(Compress::Zlib), perl(IO::Zlib) BuildArch: noarch @@ -241,29 +227,12 @@ IO::Zlib module installed, Archive::Tar will also support compressed or gzipped tar files. -%package Class-ISA -Summary: Report the search path for a class's ISA tree -Group: Development/Libraries -License: GPL+ or Artistic -Epoch: 0 -Version: 0.36 -Requires: perl = %{perl_epoch}:%{perl_version}-%{release} -BuildArch: noarch - -%description Class-ISA -Suppose you have a class (like Food::Fish::Fishstick) that is derived, via -its @ISA, from one or more superclasses (as Food::Fish::Fishstick is from -Food::Fish, Life::Fungus, and Chemicals), and some of those superclasses -may themselves each be derived, via its @ISA, from one or more superclasses -(as above). - - %package CGI Summary: Handle Common Gateway Interface requests and responses Group: Development/Libraries License: GPL+ or Artistic Epoch: 0 -Version: 3.49 +Version: 3.52 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} BuildArch: noarch @@ -283,7 +252,7 @@ Summary: Low-Level Interface to the zlib compression library Group: Development/Libraries License: GPL+ or Artistic Epoch: 0 -Version: 2.024 +Version: 2.033 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} %description Compress-Raw-Zlib @@ -296,7 +265,7 @@ Summary: Query, download and build perl modules from CPAN sites Group: Development/Languages License: GPL+ or Artistic Epoch: 0 -Version: 1.9402 +Version: 1.9600 # CPAN encourages Digest::SHA strongly because of integrity checks Requires: perl(Digest::SHA) Requires: perl = %{perl_epoch}:%{perl_version}-%{release} @@ -312,14 +281,15 @@ Summary: API & CLI access to the CPAN mirrors Group: Development/Libraries License: GPL+ or Artistic Epoch: 0 -Version: 0.90 +# real version 0.9103 +Version: 0.91.3 # CPANPLUS encourages Digest::SHA strongly because of integrity checks Requires: perl(Digest::SHA) Requires: perl(Module::Pluggable) >= 2.4 Requires: perl(Module::CoreList) Requires: perl(DBIx::Simple) Requires: perl = %{perl_epoch}:%{perl_version}-%{release} -Provides: perl-CPANPLUS-Dist-Build = 0.06 +Provides: perl-CPANPLUS-Dist-Build = 0.54 Obsoletes: perl-CPANPLUS-Dist-Build <= 0.05 BuildArch: noarch @@ -334,7 +304,7 @@ Group: Development/Libraries License: GPL+ or Artistic # Epoch bump for clean upgrade over old standalone package Epoch: 1 -Version: 5.47 +Version: 5.61 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} %description Digest-SHA @@ -350,7 +320,8 @@ Group: Development/Libraries License: GPL+ or Artistic # Epoch bump for clean upgrade over old standalone package Epoch: 1 -Version: 0.27 +# real version 0.280203 https://fedoraproject.org/wiki/Perl/Tips#Dot_approach +Version: 0.28.2.3 Requires: perl-devel Requires: perl = %{perl_epoch}:%{perl_version}-%{release} BuildArch: noarch @@ -366,7 +337,7 @@ Summary: Utilities for embedding Perl in C/C++ applications Group: Development/Languages License: GPL+ or Artistic Epoch: 0 -Version: 1.28 +Version: 1.30 Requires: perl-devel Requires: perl = %{perl_epoch}:%{perl_version}-%{release} BuildArch: noarch @@ -380,7 +351,7 @@ Summary: Create a module Makefile Group: Development/Languages License: GPL+ or Artistic Epoch: 0 -Version: 6.56 +Version: 6.57.5 Requires: perl-devel Requires: perl = %{perl_epoch}:%{perl_version}-%{release} Requires: perl(Test::Harness) @@ -396,10 +367,7 @@ Group: Development/Libraries License: GPL+ or Artistic # Epoch bump for clean upgrade over old standalone package Epoch: 1 -# We must preserve 4-digit precison since 2.2002 version -%global ExtUtils_ParseXS_real_version 2.22 -%global ExtUtils_ParseXS_version %{ExtUtils_ParseXS_real_version}06 -Version: %{ExtUtils_ParseXS_version} +Version: 2.2210 Requires: perl-devel Requires: perl = %{perl_epoch}:%{perl_version}-%{release} BuildArch: noarch @@ -416,7 +384,7 @@ Summary: Generic file fetching mechanism Group: Development/Libraries License: GPL+ or Artistic Epoch: 0 -Version: 0.24 +Version: 0.32 Requires: perl(IPC::Cmd) >= 0.36 Requires: perl(Module::Load::Conditional) >= 0.04 Requires: perl(Params::Check) >= 0.07 @@ -432,7 +400,7 @@ Summary: IO::Compress wrapper for modules Group: Development/Libraries License: GPL+ or Artistic Epoch: 0 -Version: 2.026 +Version: 2.033 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} Obsoletes: perl-Compress-Zlib <= 2.020 Provides: perl(IO::Uncompress::Bunzip2) @@ -467,7 +435,7 @@ Group: Development/Libraries License: GPL+ or Artistic # Epoch bump for clean upgrade over old standalone package Epoch: 1 -Version: 0.54 +Version: 0.70 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} BuildArch: noarch @@ -497,7 +465,7 @@ Group: Development/Libraries License: GPL+ or Artistic # Epoch bump for clean upgrade over old standalone package Epoch: 1 -Version: 0.02 +Version: 0.04 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} # Add a versioned provides, since we pull the unversioned one out. Provides: perl(Log::Message::Handlers) = %{version} @@ -517,7 +485,7 @@ Summary: Simplified frontend to Log::Message Group: Development/Libraries License: GPL+ or Artistic Epoch: 0 -Version: 0.06 +Version: 0.08 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} BuildArch: noarch @@ -532,7 +500,7 @@ Group: Development/Libraries License: GPL+ or Artistic # Epoch bump for clean upgrade over old standalone package Epoch: 1 -Version: 0.3603 +Version: 0.3800 Requires: perl(Archive::Tar) >= 1.08 Requires: perl(ExtUtils::CBuilder) >= 0.15 Requires: perl(ExtUtils::ParseXS) >= 1.02 @@ -556,7 +524,7 @@ Summary: Perl core modules indexed by perl versions Group: Development/Languages License: GPL+ or Artistic Epoch: 0 -Version: 2.29 +Version: 2.47 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} Requires: perl(version) BuildArch: noarch @@ -573,7 +541,7 @@ Group: Development/Libraries License: GPL+ or Artistic # Epoch bump for clean upgrade over old standalone package Epoch: 1 -Version: 0.16 +Version: 0.18 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} BuildArch: noarch @@ -587,7 +555,7 @@ Summary: Looking up module information / loading at runtime Group: Development/Libraries License: GPL+ or Artistic Epoch: 0 -Version: 0.34 +Version: 0.44 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} BuildArch: noarch @@ -635,7 +603,7 @@ Group: Development/Libraries License: GPL+ or Artistic # Epoch bump for clean upgrade over old standalone package Epoch: 1 -Version: 0.36 +Version: 0.38 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} BuildArch: noarch @@ -662,10 +630,11 @@ for a Constants.pm file. %package PathTools Summary: PathTools Perl module (Cwd, File::Spec) +# PathTools aka File::Spec Group: Development/Libraries License: (GPL+ or Artistic) and BSD Epoch: 0 -Version: 3.31 +Version: 3.33 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} %description PathTools @@ -678,7 +647,7 @@ Group: Development/Libraries License: GPL+ or Artistic # Epoch bump for clean upgrade over old standalone package Epoch: 1 -Version: 0.26 +Version: 0.28 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} BuildArch: noarch @@ -692,7 +661,8 @@ Group: Development/Libraries License: GPL+ or Artistic # Epoch bump for clean upgrade over old standalone package Epoch: 1 -Version: 1.40 +# 1.4401 +Version: 1.44.1 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} BuildArch: noarch # FIXME it could be removed now? @@ -724,7 +694,7 @@ Group: Development/Libraries License: GPL+ or Artistic # Epoch bump for clean upgrade over old standalone package Epoch: 1 -Version: 3.13 +Version: 3.16 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} BuildArch: noarch @@ -738,7 +708,7 @@ Summary: A selection of general-utility scalar and list subroutines Group: Development/Libraries License: GPL+ or Artistic Epoch: 0 -Version: 1.22 +Version: 1.23 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} %description Scalar-List-Utils @@ -753,7 +723,7 @@ Summary: Term::ReadLine UI made easy Group: Development/Libraries License: GPL+ or Artistic Epoch: 0 -Version: 0.20 +Version: 0.26 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} Requires: perl(Log::Message::Simple) BuildArch: noarch @@ -769,7 +739,7 @@ Summary: Run Perl standard test scripts with statistics Group: Development/Languages License: GPL+ or Artistic Epoch: 0 -Version: 3.17 +Version: 3.23 Requires: perl-devel Requires: perl = %{perl_epoch}:%{perl_version}-%{release} BuildArch: noarch @@ -786,7 +756,7 @@ Summary: Basic utilities for writing tests Group: Development/Languages License: GPL+ or Artistic Epoch: 0 -Version: 0.94 +Version: 0.98 Requires: perl-devel Requires: perl = %{perl_epoch}:%{perl_version}-%{release} BuildArch: noarch @@ -800,8 +770,8 @@ Summary: Test suite for package perl-Test-Simple Group: Development/Debug License: GPL+ or Artistic Epoch: 0 -Version: 0.94 -Requires: perl-Test-Simple = 0:0.94-%{release} +Version: 0.98 +Requires: perl-Test-Simple = 0:0.98-%{release} Requires: /usr/bin/prove AutoReqProv: 0 BuildArch: noarch @@ -815,7 +785,8 @@ Summary: Time objects from localtime and gmtime Group: Development/Libraries License: GPL+ or Artistic Epoch: 0 -Version: 1.15 +# real 1.20_01 +Version: 1.20.1 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} %description Time-Piece @@ -831,7 +802,7 @@ Group: Development/Libraries License: GPL+ or Artistic # Epoch bump for clean upgrade over old standalone package Epoch: 1 -Version: 0.223 +Version: 0.225 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} BuildArch: noarch @@ -854,7 +825,7 @@ Summary: Perl interpreter-based threads Group: Development/Libraries License: GPL+ or Artistic Epoch: 0 -Version: 1.75 +Version: 1.83 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} %description threads @@ -875,7 +846,7 @@ Summary: Perl extension for sharing data structures between threads Group: Development/Libraries License: GPL+ or Artistic Epoch: 0 -Version: 1.32 +Version: 1.37 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} %description threads-shared @@ -893,7 +864,7 @@ Group: Development/Libraries License: GPL+ or Artistic # Epoch bump for clean upgrade over old standalone package Epoch: 3 -Version: 0.82 +Version: 0.88 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} BuildArch: noarch @@ -914,18 +885,18 @@ Requires: perl = %{perl_epoch}:%{perl_version}-%{release} Requires: perl-libs = %{perl_epoch}:%{perl_version}-%{release} Requires: perl-devel = %{perl_epoch}:%{perl_version}-%{release} -Requires: perl-Archive-Extract, perl-Archive-Tar, perl-Class-ISA, -Requires: perl-Compress-Raw-Zlib, perl-CGI, perl-CPAN, -Requires: perl-CPANPLUS, perl-Digest-SHA, perl-ExtUtils-CBuilder, -Requires: perl-ExtUtils-Embed, perl-ExtUtils-MakeMaker, perl-ExtUtils-ParseXS, -Requires: perl-File-Fetch, perl-IO-Compress, perl-IO-Zlib, -Requires: perl-IPC-Cmd, perl-Locale-Maketext-Simple, perl-Log-Message, perl-Log-Message-Simple, -Requires: perl-Module-Build, perl-Module-CoreList, perl-Module-Load, -Requires: perl-Module-Load-Conditional, perl-Module-Loaded, +Requires: perl-Archive-Extract, perl-Archive-Tar +Requires: perl-Compress-Raw-Zlib, perl-CGI, perl-CPAN +Requires: perl-CPANPLUS, perl-Digest-SHA, perl-ExtUtils-CBuilder +Requires: perl-ExtUtils-Embed, perl-ExtUtils-MakeMaker, perl-ExtUtils-ParseXS +Requires: perl-File-Fetch, perl-IO-Compress, perl-IO-Zlib +Requires: perl-IPC-Cmd, perl-Locale-Maketext-Simple, perl-Log-Message, perl-Log-Message-Simple +Requires: perl-Module-Build, perl-Module-CoreList, perl-Module-Load +Requires: perl-Module-Load-Conditional, perl-Module-Loaded Requires: perl-Module-Pluggable, perl-Object-Accessor, perl-Package-Constants, perl-PathTools -Requires: perl-Params-Check, perl-Pod-Escapes, perl-Pod-Simple, perl-Term-UI, +Requires: perl-Params-Check, perl-Parse-CPAN-Meta, perl-Pod-Escapes, perl-Pod-Simple, perl-Term-UI Requires: perl-Test-Harness, perl-Test-Simple, perl-Time-Piece, perl-version -Requires: perl-threads, perl-threads-shared, perl-parent, perl-Parse-CPAN-Meta +Requires: perl-threads, perl-threads-shared, perl-parent %description core A metapackage which requires all of the perl bits and modules in the upstream @@ -933,7 +904,7 @@ tarball from perl.org. %{?perl_default_filter} %prep -%setup -q -n perl-%{perl_version} +%setup -q -n perl-%{perl_version}-RC1 %patch1 -p1 %ifarch %{multilib_64_archs} %patch3 -p1 @@ -942,10 +913,6 @@ tarball from perl.org. %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 #copy the example script cp -a %{SOURCE5} . @@ -1080,7 +1047,6 @@ make %{?_smp_mflags} %endif %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %global build_archlib $RPM_BUILD_ROOT%{archlib} @@ -1153,10 +1119,6 @@ pushd %{build_archlib}/CORE/ 'Fedora Patch5: USE_MM_LD_RUN_PATH' \ 'Fedora Patch6: Skip hostname tests, due to builders not being network capable' \ 'Fedora Patch7: Dont run one io test due to random builder failures' \ - 'Fedora Patch8: Do not leak when destroying thread; RT #77352' \ - 'Fedora Patch9: h2ph produces incorrect code in preamble, based mainly on RT #74614 ' \ - 'Fedora Patch10: Update ExtUtils::ParseXS to 2.2206' \ - 'Fedora Patch11: lc launders tainted flag RT #87336' \ %{nil} rm patchlevel.bak @@ -1209,9 +1171,6 @@ sed \ #%%{__chmod} +x $T_FILES #%%{_fixperms} %%{buildroot}%%{perl5_testdir} -%clean -rm -rf $RPM_BUILD_ROOT - %check %ifnarch %if %{parallel_tests} @@ -1270,10 +1229,6 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_mandir}/man1/ptardiff.1* %exclude %{_mandir}/man3/Archive::Tar* -# Class-ISA -%exclude %{privlib}/Class/ISA.pm -%exclude %{_mandir}/man3/Class::ISA.3* - # CGI %exclude %{privlib}/CGI/ %exclude %{privlib}/CGI.pm @@ -1371,7 +1326,6 @@ rm -rf $RPM_BUILD_ROOT # Compress::Zlib %exclude %{privlib}/Compress/Zlib.pm -%exclude %{archlib}/auto/Compress/Zlib/ %exclude %{_mandir}/man3/Compress::Zlib* # IO::Compress::Base %exclude %{privlib}/File/GlobMapper.pm @@ -1610,11 +1564,6 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/ptardiff.1* %{_mandir}/man3/Archive::Tar* -%files Class-ISA -%defattr(-,root,root,-) -%{privlib}/Class/ISA.pm -%{_mandir}/man3/Class::ISA.3* - %files CGI %defattr(-,root,root,-) %{privlib}/CGI/ @@ -1718,7 +1667,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) # Compress-Zlib %{privlib}/Compress/Zlib.pm -%{archlib}/auto/Compress/Zlib/ %{_mandir}/man3/Compress::Zlib* #IO-Compress-Base %{privlib}/File/GlobMapper.pm @@ -1957,6 +1905,12 @@ rm -rf $RPM_BUILD_ROOT # Old changelog entries are preserved in CVS. %changelog +* Fri Apr 22 2011 Marcela Mašláňová - 4:5.14.0.RC1-161 +- build RC1 of 5.14.0 +- remove Class::ISA from sub-packages +- patches 8+ are part of new release +- remove vendorarch/auto/Compress/Zlib + * Wed Apr 13 2011 Marcela Mašláňová - 4:5.12.3-160 - add provides UNIVERSAL and DB back into perl From 0023f59d8d8e183abbe533ed1ae10a163000d55c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 29 Apr 2011 14:00:53 +0200 Subject: [PATCH 03/13] Buildroot is not needed for a long time. --- perl.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/perl.spec b/perl.spec index 1d8445f..5dc9c68 100644 --- a/perl.spec +++ b/perl.spec @@ -66,7 +66,6 @@ Patch7: perl-5.10.0-x86_64-io-test-failure.patch # Update some of the bundled modules # see http://fedoraproject.org/wiki/Perl/perl.spec for instructions -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: db4-devel, gdbm-devel, groff, tcsh, zlib-devel, systemtap-sdt-devel # For tests BuildRequires: procps, rsyslog From e3d6b6ef4d46cf90abddfb7e042570ab9e6e0fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 6 May 2011 12:33:39 +0200 Subject: [PATCH 04/13] Remove defattr Not needed since rpm4.4 --- perl.spec | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/perl.spec b/perl.spec index 5dc9c68..5846d51 100644 --- a/perl.spec +++ b/perl.spec @@ -1185,7 +1185,6 @@ sed \ %postun libs -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc Artistic AUTHORS Copying README Changes %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* @@ -1525,7 +1524,6 @@ sed \ %dir %{_prefix}/local/%{_lib}/perl5 %files devel -%defattr(-,root,root,-) %{_bindir}/enc2xs %{_mandir}/man1/enc2xs* %{privlib}/Encode/ @@ -1544,17 +1542,14 @@ sed \ %doc perl-example.stp %files tests -%defattr(-,root,root,-) %{perl5_testdir}/ %exclude %{perl5_testdir}/Test-Simple %files Archive-Extract -%defattr(-,root,root,-) %{privlib}/Archive/Extract.pm %{_mandir}/man3/Archive::Extract.3* %files Archive-Tar -%defattr(-,root,root,-) %{_bindir}/ptar %{_bindir}/ptardiff %{privlib}/Archive/Tar/ @@ -1564,14 +1559,12 @@ sed \ %{_mandir}/man3/Archive::Tar* %files CGI -%defattr(-,root,root,-) %{privlib}/CGI/ %{privlib}/CGI.pm %{_mandir}/man3/CGI.3* %{_mandir}/man3/CGI::*.3* %files Compress-Raw-Zlib -%defattr(-,root,root,-) %dir %{archlib}/Compress %{archlib}/Compress/Raw/ %dir %{archlib}/auto/Compress/ @@ -1580,7 +1573,6 @@ sed \ %{_mandir}/man3/Compress::Raw::Zlib* %files CPAN -%defattr(-,root,root,-) %{_bindir}/cpan %{privlib}/CPAN/ %{privlib}/CPAN.pm @@ -1589,7 +1581,6 @@ sed \ %{_mandir}/man3/CPAN:* %files CPANPLUS -%defattr(-,root,root,-) %{_bindir}/cpan2dist %{_bindir}/cpanp %{_bindir}/cpanp-run-perl @@ -1600,7 +1591,6 @@ sed \ %{_mandir}/man3/CPANPLUS* %files Digest-SHA -%defattr(-,root,root,-) %{_bindir}/shasum %dir %{archlib}/Digest/ %{archlib}/Digest/SHA.pm @@ -1609,18 +1599,15 @@ sed \ %{_mandir}/man3/Digest::SHA.3* %files ExtUtils-CBuilder -%defattr(-,root,root,-) %{privlib}/ExtUtils/CBuilder/ %{privlib}/ExtUtils/CBuilder.pm %{_mandir}/man3/ExtUtils::CBuilder* %files ExtUtils-Embed -%defattr(-,root,root,-) %{privlib}/ExtUtils/Embed.pm %{_mandir}/man3/ExtUtils::Embed* %files ExtUtils-MakeMaker -%defattr(-,root,root,-) %{_bindir}/instmodsh %{privlib}/ExtUtils/Command/ %{privlib}/ExtUtils/Install.pm @@ -1652,18 +1639,15 @@ sed \ %{_mandir}/man3/ExtUtils::testlib.3* %files ExtUtils-ParseXS -%defattr(-,root,root,-) %{privlib}/ExtUtils/ParseXS.pm %{privlib}/ExtUtils/xsubpp %{_mandir}/man3/ExtUtils::ParseXS.3* %files File-Fetch -%defattr(-,root,root,-) %{privlib}/File/Fetch.pm %{_mandir}/man3/File::Fetch.3* %files IO-Compress -%defattr(-,root,root,-) # Compress-Zlib %{privlib}/Compress/Zlib.pm %{_mandir}/man3/Compress::Zlib* @@ -1679,7 +1663,6 @@ sed \ %{_mandir}/man3/IO::Uncompress::Base.* # IO-Compress-Zlib -%defattr(-,root,root,-) %{privlib}/IO/Compress/Adapter/ %{privlib}/IO/Compress/Deflate.pm %{privlib}/IO/Compress/Gzip/ @@ -1705,22 +1688,18 @@ sed \ %{_mandir}/man3/IO::Uncompress::Unzip* %files IO-Zlib -%defattr(-,root,root,-) %{privlib}/IO/Zlib.pm %{_mandir}/man3/IO::Zlib.* %files IPC-Cmd -%defattr(-,root,root,-) %{privlib}/IPC/Cmd.pm %{_mandir}/man3/IPC::Cmd.3* %files Locale-Maketext-Simple -%defattr(-,root,root,-) %{privlib}/Locale/Maketext/Simple.pm %{_mandir}/man3/Locale::Maketext::Simple.* %files Log-Message -%defattr(-,root,root,-) %{privlib}/Log/Message.pm %{privlib}/Log/Message/Config.pm %{privlib}/Log/Message/Handlers.pm @@ -1731,12 +1710,10 @@ sed \ %{_mandir}/man3/Log::Message::Item.3* %files Log-Message-Simple -%defattr(-,root,root,-) %{privlib}/Log/Message/Simple.pm %{_mandir}/man3/Log::Message::Simple.3* %files Module-Build -%defattr(-,root,root,-) %{_bindir}/config_data %{privlib}/inc/ %{privlib}/Module/Build/ @@ -1746,30 +1723,25 @@ sed \ %{_mandir}/man3/inc::latest.3* %files Module-CoreList -%defattr(-,root,root,-) %{_bindir}/corelist %{privlib}/Module/CoreList.pm %{_mandir}/man1/corelist* %{_mandir}/man3/Module::CoreList* %files Module-Load -%defattr(-,root,root,-) %{privlib}/Module/Load.pm %{_mandir}/man3/Module::Load.* %files Module-Load-Conditional -%defattr(-,root,root,-) %{privlib}/Module/Load/ %{_mandir}/man3/Module::Load::Conditional* %files Module-Loaded -%defattr(-,root,root,-) %dir %{privlib}/Module/ %{privlib}/Module/Loaded.pm %{_mandir}/man3/Module::Loaded* %files Module-Pluggable -%defattr(-,root,root,-) %{privlib}/Devel/InnerPackage.pm %{privlib}/Module/Pluggable/ %{privlib}/Module/Pluggable.pm @@ -1777,17 +1749,14 @@ sed \ %{_mandir}/man3/Module::Pluggable* %files Object-Accessor -%defattr(-,root,root,-) %{privlib}/Object/ %{_mandir}/man3/Object::Accessor* %files Package-Constants -%defattr(-,root,root,-) %{privlib}/Package/ %{_mandir}/man3/Package::Constants* %files PathTools -%defattr(-,root,root,-) %{archlib}/Cwd.pm %{archlib}/File/Spec* %{archlib}/auto/Cwd/ @@ -1795,31 +1764,26 @@ sed \ %{_mandir}/man3/File::Spec* %files Params-Check -%defattr(-,root,root,-) %{privlib}/Params/ %{_mandir}/man3/Params::Check* %files Parse-CPAN-Meta -%defattr(-,root,root,-) %dir %{privlib}/Parse/ %dir %{privlib}/Parse/CPAN/ %{privlib}/Parse/CPAN/Meta.pm %{_mandir}/man3/Parse::CPAN::Meta.3* %files Pod-Escapes -%defattr(-,root,root,-) %{privlib}/Pod/Escapes.pm %{_mandir}/man3/Pod::Escapes.* %files Pod-Simple -%defattr(-,root,root,-) %{privlib}/Pod/Simple/ %{privlib}/Pod/Simple.pm %{privlib}/Pod/Simple.pod %{_mandir}/man3/Pod::Simple* %files Scalar-List-Utils -%defattr(-,root,root,-) %{archlib}/List/ %{archlib}/List/Util/ %{archlib}/List/Util.pm @@ -1832,13 +1796,11 @@ sed \ %{_mandir}/man3/Scalar::Util* %files Term-UI -%defattr(-,root,root,-) %{privlib}/Term/UI/ %{privlib}/Term/UI.pm %{_mandir}/man3/Term::UI* %files Test-Harness -%defattr(-,root,root,-) %{_bindir}/prove %{privlib}/App* %{privlib}/TAP* @@ -1849,7 +1811,6 @@ sed \ %{_mandir}/man3/Test::Harness* %files Test-Simple -%defattr(-,root,root,-) %{privlib}/Test/More* %{privlib}/Test/Builder* %{privlib}/Test/Simple* @@ -1860,12 +1821,10 @@ sed \ %{_mandir}/man3/Test::Tutorial* %files Test-Simple-tests -%defattr(-,root,root,-) %dir %{perl5_testdir} %{perl5_testdir}/Test-Simple %files Time-Piece -%defattr(-,root,root,-) %{archlib}/Time/Piece.pm %{archlib}/Time/Seconds.pm %{archlib}/auto/Time/Piece/ @@ -1873,26 +1832,22 @@ sed \ %{_mandir}/man3/Time::Seconds.3* %files parent -%defattr(-,root,root,-) %{privlib}/parent.pm %{_mandir}/man3/parent.3* %files threads -%defattr(-,root,root,-) %dir %{archlib}/auto/threads %{archlib}/auto/threads/threads* %{archlib}/threads.pm %{_mandir}/man3/threads.3* %files threads-shared -%defattr(-,root,root,-) %{archlib}/auto/threads/shared* %dir %{archlib}/threads %{archlib}/threads/shared* %{_mandir}/man3/threads::shared* %files version -%defattr(-,root,root,-) %{privlib}/version.pm %{privlib}/version.pod %{privlib}/version/ From a62d7bff19ecc75513007d2b06650d74728822a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 6 May 2011 14:03:44 +0200 Subject: [PATCH 05/13] Upload 5.14.0-RC2 --- .gitignore | 1 + perl.spec | 4 ++-- sources | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1937da7..d973a00 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ filter-requires.sh /perl-5.12.3.tar.gz /perl.stp /perl-example.stp +/perl-5.14.0-RC2.tar.bz2 diff --git a/perl.spec b/perl.spec index 5846d51..f89581b 100644 --- a/perl.spec +++ b/perl.spec @@ -32,7 +32,7 @@ Group: Development/Languages # Copyright Only: for example ext/Text-Soundex/Soundex.xs License: (GPL+ or Artistic) and (GPLv2+ or Artistic) and Copyright Only and MIT and Public Domain and UCD Url: http://www.perl.org/ -Source0: http://www.cpan.org/src/5.0/perl-%{perl_version}-RC1.tar.bz2 +Source0: http://www.cpan.org/src/5.0/perl-%{perl_version}-RC2.tar.bz2 Source2: perl-5.8.0-libnet.cfg Source3: macros.perl #Systemtap tapset and example that make use of systemtap-sdt-devel @@ -903,7 +903,7 @@ tarball from perl.org. %{?perl_default_filter} %prep -%setup -q -n perl-%{perl_version}-RC1 +%setup -q -n perl-%{perl_version}-RC2 %patch1 -p1 %ifarch %{multilib_64_archs} %patch3 -p1 diff --git a/sources b/sources index 986d98b..f2bcf99 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ aceea3db13a159cd5f7e5f2e3ad9534f perl-5.8.0-libdir64.patch -26be2f310eef77f206c47e380518cbd8 macros.perl ad5d07285d6e4914384b43c9abc2bdba filter-requires.sh -29975a69dce54e47fcd6331c085c6c99 perl-5.12.3.tar.gz 1737a36154bb5bca781296794afc6791 perl.stp df28fe2c574e8807d0a803308c545dca perl-example.stp +513e7bd5f97446bb02c9012ac19675c3 perl-5.14.0-RC2.tar.bz2 +fa0e67ce4def80b563f4b312f770a8ff macros.perl From eb43c01bc3a6dc5278b989821f6699485fb6ed21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 6 May 2011 14:04:22 +0200 Subject: [PATCH 06/13] VMS shouldn't be required by any package in Fedora. --- perl.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/perl.spec b/perl.spec index f89581b..bb8bedd 100644 --- a/perl.spec +++ b/perl.spec @@ -73,8 +73,9 @@ BuildRequires: procps, rsyslog # The long line of Perl provides. # These provides are needed by the perl pkg itself with auto-generated perl.req -Provides: perl(VMS::Filespec) -Provides: perl(VMS::Stdio) +# TODO: do not add them, requires should be filtered. +#Provides: perl(VMS::Filespec) +#Provides: perl(VMS::Stdio) # Compat provides Provides: perl(:MODULE_COMPAT_5.14.0) From 062adbfc678c0c037d4e7dc2cc0a7a1acd66c794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Wed, 11 May 2011 12:54:12 +0200 Subject: [PATCH 07/13] Unofficial 5.14 release (build for testing purposes). --- .gitignore | 1 + perl.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d973a00..637d46a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ filter-requires.sh /perl.stp /perl-example.stp /perl-5.14.0-RC2.tar.bz2 +/perl-5.14.0.tar.bz2 diff --git a/perl.spec b/perl.spec index bb8bedd..2cc7dae 100644 --- a/perl.spec +++ b/perl.spec @@ -32,7 +32,7 @@ Group: Development/Languages # Copyright Only: for example ext/Text-Soundex/Soundex.xs License: (GPL+ or Artistic) and (GPLv2+ or Artistic) and Copyright Only and MIT and Public Domain and UCD Url: http://www.perl.org/ -Source0: http://www.cpan.org/src/5.0/perl-%{perl_version}-RC2.tar.bz2 +Source0: http://www.cpan.org/src/5.0/perl-%{perl_version}.tar.bz2 Source2: perl-5.8.0-libnet.cfg Source3: macros.perl #Systemtap tapset and example that make use of systemtap-sdt-devel @@ -904,7 +904,7 @@ tarball from perl.org. %{?perl_default_filter} %prep -%setup -q -n perl-%{perl_version}-RC2 +%setup -q -n perl-%{perl_version} %patch1 -p1 %ifarch %{multilib_64_archs} %patch3 -p1 diff --git a/sources b/sources index f2bcf99..8314b18 100644 --- a/sources +++ b/sources @@ -2,5 +2,5 @@ aceea3db13a159cd5f7e5f2e3ad9534f perl-5.8.0-libdir64.patch ad5d07285d6e4914384b43c9abc2bdba filter-requires.sh 1737a36154bb5bca781296794afc6791 perl.stp df28fe2c574e8807d0a803308c545dca perl-example.stp -513e7bd5f97446bb02c9012ac19675c3 perl-5.14.0-RC2.tar.bz2 fa0e67ce4def80b563f4b312f770a8ff macros.perl +20af60d2fcf672f1158057e1b463e98a perl-5.14.0.tar.bz2 From 6685867f855a089e356ec4284f4d303ee364382c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Tue, 17 May 2011 10:35:45 +0200 Subject: [PATCH 08/13] Change changelog --- .gitignore | 1 + perl.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 637d46a..2977897 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ filter-requires.sh /perl-example.stp /perl-5.14.0-RC2.tar.bz2 /perl-5.14.0.tar.bz2 +/perl-5.14.0.tar.gz diff --git a/perl.spec b/perl.spec index 2cc7dae..db83c93 100644 --- a/perl.spec +++ b/perl.spec @@ -1860,8 +1860,8 @@ sed \ # Old changelog entries are preserved in CVS. %changelog -* Fri Apr 22 2011 Marcela Mašláňová - 4:5.14.0.RC1-161 -- build RC1 of 5.14.0 +* Mon May 16 2011 Marcela Mašláňová - 4:5.14.0-161 +- test build of released 5.14.0 - remove Class::ISA from sub-packages - patches 8+ are part of new release - remove vendorarch/auto/Compress/Zlib diff --git a/sources b/sources index 8314b18..507f93c 100644 --- a/sources +++ b/sources @@ -3,4 +3,4 @@ ad5d07285d6e4914384b43c9abc2bdba filter-requires.sh 1737a36154bb5bca781296794afc6791 perl.stp df28fe2c574e8807d0a803308c545dca perl-example.stp fa0e67ce4def80b563f4b312f770a8ff macros.perl -20af60d2fcf672f1158057e1b463e98a perl-5.14.0.tar.bz2 +e688b0ddad50bca9a6223693a85c439d perl-5.14.0.tar.gz From 26eb2394960db91236a5d6cc3b4761fe2ad810b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Tue, 17 May 2011 10:57:53 +0200 Subject: [PATCH 09/13] Apply correct release 5.14.0 version. --- perl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl.spec b/perl.spec index db83c93..fd5bc9e 100644 --- a/perl.spec +++ b/perl.spec @@ -32,7 +32,7 @@ Group: Development/Languages # Copyright Only: for example ext/Text-Soundex/Soundex.xs License: (GPL+ or Artistic) and (GPLv2+ or Artistic) and Copyright Only and MIT and Public Domain and UCD Url: http://www.perl.org/ -Source0: http://www.cpan.org/src/5.0/perl-%{perl_version}.tar.bz2 +Source0: http://www.cpan.org/src/5.0/perl-%{perl_version}.tar.gz Source2: perl-5.8.0-libnet.cfg Source3: macros.perl #Systemtap tapset and example that make use of systemtap-sdt-devel From 957625761911e2b21cc3247da5a2d57f4951df52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Tue, 17 May 2011 13:41:28 +0200 Subject: [PATCH 10/13] Fix patch for MM_LD_RUN_PATH for fuzz=0 --- perl-USE_MM_LD_RUN_PATH.patch | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/perl-USE_MM_LD_RUN_PATH.patch b/perl-USE_MM_LD_RUN_PATH.patch index 5b1ef76..e6ec394 100644 --- a/perl-USE_MM_LD_RUN_PATH.patch +++ b/perl-USE_MM_LD_RUN_PATH.patch @@ -1,6 +1,6 @@ -diff -up perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm.runpath perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm ---- perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm.runpath 2010-01-18 19:52:49.000000000 +0100 -+++ perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm 2010-04-13 15:56:55.859789425 +0200 +diff -up perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm.usem perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm +--- perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm.usem 2011-05-08 05:10:08.000000000 +0200 ++++ perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm 2011-05-17 11:14:22.169115984 +0200 @@ -88,6 +88,11 @@ libraries. LD_RUN_PATH is a colon separ in LDLOADLIBS. It is passed as an environment variable to the process that links the shared library. @@ -13,10 +13,10 @@ diff -up perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm.runpath per =head2 BSLOADLIBS List of those libraries that are needed but can be linked in -diff -up perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm.runpath perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm ---- perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm.runpath 2010-01-18 19:52:49.000000000 +0100 -+++ perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 2010-04-13 16:00:32.941778159 +0200 -@@ -262,7 +262,7 @@ sub full_setup { +diff -up perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm.usem perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm +--- perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm.usem 2011-05-08 05:10:08.000000000 +0200 ++++ perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 2011-05-17 13:39:26.912586030 +0200 +@@ -278,7 +278,7 @@ sub full_setup { PERL_SRC PERM_DIR PERM_RW PERM_RWX PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE PPM_INSTALL_EXEC PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ @@ -25,7 +25,7 @@ diff -up perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm.runpath p XS_VERSION clean depend dist dynamic_lib linkext macro realclean tool_autosplit -@@ -406,7 +406,27 @@ sub new { +@@ -422,7 +422,27 @@ sub new { # PRINT_PREREQ is RedHatism. if ("@ARGV" =~ /\bPRINT_PREREQ\b/) { $self->_PRINT_PREREQ; @@ -53,8 +53,8 @@ diff -up perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm.runpath p + }; print STDOUT "MakeMaker (v$VERSION)\n" if $Verbose; - if (-f "MANIFEST" && ! -f "Makefile"){ -@@ -2320,6 +2340,40 @@ precedence. A typemap in the current di + if (-f "MANIFEST" && ! -f "Makefile" && ! $ENV{PERL_CORE}){ +@@ -2352,6 +2372,40 @@ precedence. A typemap in the current di precedence, even if it isn't listed in TYPEMAPS. The default system typemap has lowest precedence. @@ -95,9 +95,9 @@ diff -up perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm.runpath p =item VENDORPREFIX Like PERLPREFIX, but only for the vendor install locations. -diff -up perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.runpath perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm ---- perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.runpath 2010-01-18 19:52:49.000000000 +0100 -+++ perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2010-04-13 15:56:10.656775285 +0200 +diff -up perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.usem perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm +--- perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.usem 2011-05-08 05:10:08.000000000 +0200 ++++ perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2011-05-17 11:14:22.172115972 +0200 @@ -944,7 +944,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $ } From 0cc0ea5905933e0c336cad8668a125c54e4e3bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Tue, 17 May 2011 14:45:59 +0200 Subject: [PATCH 11/13] Remove empty ifnarch If test were failing on some architectures, we don't know on which. This could be re-added if tests will be failing again on koji. --- perl.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/perl.spec b/perl.spec index fd5bc9e..92a9ef0 100644 --- a/perl.spec +++ b/perl.spec @@ -1172,14 +1172,12 @@ sed \ #%%{_fixperms} %%{buildroot}%%{perl5_testdir} %check -%ifnarch %if %{parallel_tests} JOBS=$(printf '%%s' "%{?_smp_mflags}" | sed 's/.*-j\([0-9][0-9]*\).*/\1/') LC_ALL=C TEST_JOBS=$JOBS make test_harness %else LC_ALL=C make test %endif -%endif %post libs -p /sbin/ldconfig From ba86d0eba97ae09d713f3f9cc4a7663058e61dcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Wed, 8 Jun 2011 15:58:01 +0200 Subject: [PATCH 12/13] Change macros according to new definition. --- macros.perl | 11 ++++++----- sources | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/macros.perl b/macros.perl index 9ba91e9..f3efc3d 100644 --- a/macros.perl +++ b/macros.perl @@ -41,11 +41,12 @@ export PERL_MM_USE_DEFAULT=1 # Note that this must be invoked in the spec file, preferably as # "%{?perl_default_filter}", before any %description block. -%perl_default_filter %{?filter_setup: %{expand: \ -%define __provides_exclude_from (%{_perl_vendorarch}\/auto\/*|%{perl_archlib}/(?!CORE/libperl).*)\.so*|%{_docdir} \ -%define __requires_exclude_from %{_docdir} \ -%filter_setup \ -}} +%perl_default_filter %{expand: \ +%global __provides_exclude_from %{perl_vendorarch}/auto/.*\.so|%{perl_archlib}/.*\.so|%{_docdir} +%global __requires_exclude_from %{_docdir} +%global __provides_exclude perl\\\\(VMS|perl\\\\(Win32|perl\\\\(BSD::|perl\\\\(DB\\\\)|perl\\\\(UNIVERSAL\\\\) +%global __requires_exclude perl\\\\(VMS|perl\\\\(BSD::|perl\\\\(Win32 +} ############################################################################# # Macros to assist with generating a "-tests" subpackage in a semi-automatic diff --git a/sources b/sources index 507f93c..ca9a89e 100644 --- a/sources +++ b/sources @@ -2,5 +2,4 @@ aceea3db13a159cd5f7e5f2e3ad9534f perl-5.8.0-libdir64.patch ad5d07285d6e4914384b43c9abc2bdba filter-requires.sh 1737a36154bb5bca781296794afc6791 perl.stp df28fe2c574e8807d0a803308c545dca perl-example.stp -fa0e67ce4def80b563f4b312f770a8ff macros.perl e688b0ddad50bca9a6223693a85c439d perl-5.14.0.tar.gz From 09991e2b411d346f3eb57889283f1cd076ad85b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Wed, 8 Jun 2011 16:04:07 +0200 Subject: [PATCH 13/13] arm can't do parallel builds add require EE::MM into IPC::Cmd 711486 --- perl.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/perl.spec b/perl.spec index 92a9ef0..bc4d853 100644 --- a/perl.spec +++ b/perl.spec @@ -436,6 +436,7 @@ License: GPL+ or Artistic # Epoch bump for clean upgrade over old standalone package Epoch: 1 Version: 0.70 +Requires: perl(ExtUtils::MakeMaker) Requires: perl = %{perl_epoch}:%{perl_version}-%{release} BuildArch: noarch @@ -1040,7 +1041,7 @@ echo "RPM Build arch: %{_arch}" # -Duseshrplib creates libperl.so, -Ubincompat5005 help create DSO -> libperl.so -%ifarch sparc64 +%ifarch sparc64 armv5tel make %else make %{?_smp_mflags} @@ -1858,6 +1859,10 @@ sed \ # Old changelog entries are preserved in CVS. %changelog +* Wed Jun 1 2011 Marcela Mašláňová - 4:5.14.0-161 +- arm can't do parallel builds +- add require EE::MM into IPC::Cmd 711486 + * Mon May 16 2011 Marcela Mašláňová - 4:5.14.0-161 - test build of released 5.14.0 - remove Class::ISA from sub-packages