From fa22106cc09b9ae447c80eef6b970284b5949ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 25 May 2015 11:07:52 +0200 Subject: [PATCH 1/2] Add perl516 recipe --- perl.yaml | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) diff --git a/perl.yaml b/perl.yaml index dc92560..042aeb4 100644 --- a/perl.yaml +++ b/perl.yaml @@ -24,6 +24,208 @@ # Recipe for SCL perl516 will be added later --- +perl516: + name: Perl 5.16 collection + requires: [httpd24] + packages: + - perl516: + install: + - scl-utils-build + patch: | + --- a/macro-build + +++ b/macro-build + @@ -1,7 +1,7 @@ + %__perl %_scl_root/usr/bin/perl + %__perl_provides /usr/lib/rpm/perl.prov.stack + %__perl_requires /usr/lib/rpm/perl.req.stack + -#%%perl_bootstrap 1 + +%perl_bootstrap 1 + - perl: + install: + - perl516-build + - perl516-scldevel + patch: | + --- a/perl.spec + +++ b/perl.spec + @@ -12,7 +12,7 @@ + %global tapsetdir %{_datadir}/systemtap/tapset + + %global dual_life 0 + -%global rebuild_from_scratch 0 + +%global rebuild_from_scratch 1 + + %if ! ( 0%{?rhel} && 0%{?rhel} < 7 ) + # This overrides filters from build root (/etc/rpm/macros.perl) + - perl-Pod-Usage + - perl-Perl-OSType + - perl-Digest-SHA + - perl-File-CheckTree + - perl-Readonly-XS + - perl-Capture-Tiny + - perl-Version-Requirements + - perl-threads-shared + - perl-Class-Singleton + - perl-Params-Util + - perl-IPC-Cmd + - perl-Locale-Codes + - perl-Pod-Parser + - perl-Socket + - perl-Encode + - perl-Net-Daemon + - perl-Log-Message + - perl-Taint-Runtime + - perl-PathTools + - perl-Probe-Perl + - perl-File-Copy-Recursive + - perl-ExtUtils-Manifest + - perl-Class-Inspector + - perl-Test-Pod + - perl-B-Lint + - perl-Carp + - perl-Module-Pluggable + - perl-Text-Glob + - perl-Test-Requires + - perl-Devel-Symdump + - perl-Linux-Pid + - perl-podlators + - perl-Thread-Queue + - perl-Term-UI + - perl-Data-Dumper + - perl-Module-Metadata + - perl-CPAN-Meta-Requirements + - perl-FCGI + - perl-Pod-Perldoc + - perl-Text-Unidecode + - perl-Test-Tester + - perl-Scalar-List-Utils + - perl-Digest + - perl-Filter + - perl-Text-Soundex + - perl-Number-Compare + - perl-IO-String + - perl-Sub-Install + - perl-autodie + - perl-Devel-StackTrace + - perl-Params-Check + - perl-threads + - perl-parent + - perl-Sub-Name + - perl-YAML + - perl-Compress-Raw-Zlib + - perl-Compress-Raw-Bzip2 + - perl-Readonly + - perl-Inline-Files + - perl-Pod-Simple + - perl-Tie-IxHash + - perl-Sys-Syslog + - perl-File-ShareDir + - perl-CGI + - perl-CPAN-Meta-YAML + - perl-Clone + - perl-IO-Compress + - perl-Data-OptList + - perl-Archive-Tar + - perl-PlRPC + - perl-Pod-Coverage + - perl-Test-NoWarnings + - perl-Package-Generator + - perl-Try-Tiny + - perl-JSON-PP + - perl-Pod-Checker + - perl-Test-Fatal + - perl-Sub-Exporter + - perl-Test-Pod-Coverage + - perl-Parse-CPAN-Meta + - perl-Data-Peek + - perl-File-Slurp + - perl-Test-CPAN-Meta + - perl-DBI + - perl-BSD-Resource + - perl-CPAN-Meta + - perl-IPC-Run3 + - perl-Test-Output + - perl-Package-Anon + - perl-Test-Taint + - perl-DBD-MySQL + - perl-List-MoreUtils + - perl-Test-Without-Module + - perl-Test-Script + - perl-Tree-DAG_Node + - perl-DBD-Pg + - perl-DBD-SQLite + - perl-DBIx-Simple + - perl-Package-Stash-XS + - perl-Sub-Uplevel + - perl-Test-Warn + - perl-ExtUtils-MakeMaker + - perl-Parse-RecDescent + - perl-Module-Runtime + - perl-version + - perl-Module-Build + - perl-Inline + - perl-Dist-CheckConflicts + - perl-Module-Implementation + - perl-Package-Stash + - perl-Params-Validate + - perl-DateTime-Locale + - perl-Class-Load + - perl-DateTime-TimeZone + - perl-Class-Load-XS + - perl-DateTime + - mod_perl + - perl516: + patch: | + --- a/macro-build + +++ b/macro-build + @@ -1,7 +1,7 @@ + %__perl %_scl_root/usr/bin/perl + %__perl_provides /usr/lib/rpm/perl.prov.stack + %__perl_requires /usr/lib/rpm/perl.req.stack + -%perl_bootstrap 1 + +#%%perl_bootstrap 1 + - perl: + patch: | + --- a/perl.spec + +++ b/perl.spec + @@ -12,7 +12,7 @@ + %global tapsetdir %{_datadir}/systemtap/tapset + + %global dual_life 0 + -%global rebuild_from_scratch 1 + +%global rebuild_from_scratch 0 + + %if ! ( 0%{?rhel} && 0%{?rhel} < 7 ) + # This overrides filters from build root (/etc/rpm/macros.perl) + - perl-DateTime-TimeZone + - perl-Compress-Raw-Zlib + - perl-List-MoreUtils + - perl-Params-Validate + - perl-Digest-SHA + - perl-Filter + - perl-Data-Dumper + - perl-Capture-Tiny + - perl-IO-Compress + - perl-DBI + - perl-CPAN-Meta-Requirements + - perl-Test-Requires + - perl-Class-Load + - perl-Sub-Install + - perl-Module-Metadata + - perl-CPAN-Meta-YAML + - perl-autodie + - perl-Class-Inspector + - perl-Pod-Perldoc + - perl-Module-Build + - perl-Perl-OSType + - perl-Tie-IxHash + - perl-Test-Script + - perl-Sys-Syslog + - perl-Devel-Symdump + - perl-Archive-Tar + - perl-Compress-Raw-Bzip2 + - perl-Version-Requirements +# Result is 119 source and 204 binary (168 ordinar, 36 debuginfo) packages. + rh-perl520: name: Perl 5.20 collection requires: [httpd24] From 912f6dc452c7d8a5ada02d9d0aeaf20ea3cfa9aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 25 May 2015 11:08:47 +0200 Subject: [PATCH 2/2] Fix rh-perl520 revert patches --- perl.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/perl.yaml b/perl.yaml index 042aeb4..9b9aa93 100644 --- a/perl.yaml +++ b/perl.yaml @@ -399,8 +399,8 @@ rh-perl520: %__perl_requires /usr/lib/rpm/perl.req.stack # Perl bootstrap for rebuild of Perl and all related packages - +%perl_bootstrap 1 - -#%%perl_bootstrap 1 + -%perl_bootstrap 1 + +#%%perl_bootstrap 1 # Enable SCL restrictions %perl_small 1 @@ -412,8 +412,8 @@ rh-perl520: %global tapsetdir %{_datadir}/systemtap/tapset %global dual_life 0 - +%global rebuild_from_scratch 1 - -%global rebuild_from_scratch 0 + -%global rebuild_from_scratch 1 + +%global rebuild_from_scratch 0 %if ! ( 0%{?rhel} && 0%{?rhel} < 7 ) # This overrides filters from build root (/usr/lib/rpm/macros.d/macros.perl)