From 17c4434eea985356014887918e9b66488aae72b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= ppisar@redhat.com Date: Fri, 12 Jun 2015 11:05:13 +0200 Subject: 2.4.41 bump
diff --git a/.gitignore b/.gitignore index 5bac929..80f7ebe 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /Shipwright-2.4.30.tar.gz /Shipwright-2.4.31.tar.gz /Shipwright-2.4.33.tar.gz +/Shipwright-2.4.41.tar.gz diff --git a/Shipwright-2.4.41-Disable-author-test-and-network-installation-when-bu.patch b/Shipwright-2.4.41-Disable-author-test-and-network-installation-when-bu.patch new file mode 100644 index 0000000..62347fd --- /dev/null +++ b/Shipwright-2.4.41-Disable-author-test-and-network-installation-when-bu.patch @@ -0,0 +1,33 @@ +From d91f5e2737774b445e16d1f08f6884c558401972 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= ppisar@redhat.com +Date: Fri, 12 Jun 2015 10:38:21 +0200 +Subject: [PATCH] Disable author test and network installation when building +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This does not affect run time features. It only disables things we do +not want to do when building this package. Mainly because they bring +unnecessary dependencies. + +Signed-off-by: Petr Písař ppisar@redhat.com +--- + Makefile.PL | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Makefile.PL b/Makefile.PL +index 7e321e3..d6b44cb 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -46,8 +46,6 @@ no_index( directory => 'xt' ); + install_script('bin/shipwright'); + install_script('bin/shipwright-generate'); + install_share; +-auto_install; + + tests('t/*.t t/*/*.t'); +-recursive_author_tests('xt/'); + WriteAll; +-- +2.1.0 + diff --git a/Shipwright-2.4.41-Do-not-use-usr-bin-env.patch b/Shipwright-2.4.41-Do-not-use-usr-bin-env.patch new file mode 100644 index 0000000..a193f76 --- /dev/null +++ b/Shipwright-2.4.41-Do-not-use-usr-bin-env.patch @@ -0,0 +1,90 @@ +From 28f682df4954f85166ddd1824aac3092fc91e706 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= ppisar@redhat.com +Date: Fri, 12 Jun 2015 11:01:48 +0200 +Subject: [PATCH] Do not use /usr/bin/env +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Petr Písař ppisar@redhat.com +--- + bin/shipwright | 2 +- + bin/shipwright-generate | 2 +- + share/bin/shipwright-builder | 2 +- + share/bin/shipwright-filter | 2 +- + share/bin/shipwright-utility | 4 ++-- + share/etc/shipwright-utility | 2 +- + 6 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/bin/shipwright b/bin/shipwright +index 753f63a..a837999 100755 +--- a/bin/shipwright ++++ b/bin/shipwright +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!perl + + use strict; + use warnings; +diff --git a/bin/shipwright-generate b/bin/shipwright-generate +index 379eed7..7df1fc4 100755 +--- a/bin/shipwright-generate ++++ b/bin/shipwright-generate +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!perl + + use strict; + use warnings; +diff --git a/share/bin/shipwright-builder b/share/bin/shipwright-builder +index c0200d9..be14cd4 100755 +--- a/share/bin/shipwright-builder ++++ b/share/bin/shipwright-builder +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!perl + + use warnings; + use strict; +diff --git a/share/bin/shipwright-filter b/share/bin/shipwright-filter +index 75dcfac..780c052 100755 +--- a/share/bin/shipwright-filter ++++ b/share/bin/shipwright-filter +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!perl + use strict; + use warnings; + +diff --git a/share/bin/shipwright-utility b/share/bin/shipwright-utility +index 26df3c0..543ef6d 100755 +--- a/share/bin/shipwright-utility ++++ b/share/bin/shipwright-utility +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!perl + use strict; + use warnings; + +@@ -103,7 +103,7 @@ elsif ( $args{'generate-tar-file'} ) { + + chdir $parent_dir; + print $tar_out <<'EOF'; +-#!/usr/bin/env perl ++#!perl + use strict; + use warnings; + use File::Spec::Functions; +diff --git a/share/etc/shipwright-utility b/share/etc/shipwright-utility +index c05baa8..b837cf7 100755 +--- a/share/etc/shipwright-utility ++++ b/share/etc/shipwright-utility +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!perl + use strict; + use warnings; + +-- +2.1.0 + diff --git a/perl-Shipwright.spec b/perl-Shipwright.spec index 4d95d56..b127877 100644 --- a/perl-Shipwright.spec +++ b/perl-Shipwright.spec @@ -1,51 +1,86 @@ Name: perl-Shipwright -Version: 2.4.33 -Release: 9%{?dist} +Version: 2.4.41 +Release: 1%{?dist} Summary: Build and Manage Self-contained Software Bundle License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Shipwright/ Source0: http://search.cpan.org/CPAN/authors/id/S/SU/SUNNAVY/Shipwright-%%7Bversion%7... +# Drop useless build-time feautures +Patch0: Shipwright-2.4.41-Disable-author-test-and-network-installation-when-bu.patch +# Use real interpreter path instead of /usr/bin/env trampoline +Patch1: Shipwright-2.4.41-Do-not-use-usr-bin-env.patch BuildArch: noarch -BuildRequires: perl >= 1:5.8.8 -BuildRequires: perl(Algorithm::Dependency::Ordered) -BuildRequires: perl(Algorithm::Dependency::Source::HoA) +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: make +BuildRequires: perl +BuildRequires: perl(inc::Module::Install) >= 0.76 +BuildRequires: perl(Module::Install::Metadata) +BuildRequires: perl(Module::Install::Scripts) +BuildRequires: perl(Module::Install::Share) +BuildRequires: perl(Module::Install::WriteAll) +BuildRequires: perl(strict) +BuildRequires: perl(warnings) +BuildRequires: sed +# Run-time: +# Algorithm::Dependency::Ordered not used at tests +# Algorithm::Dependency::Source::HoA not used at tests BuildRequires: perl(App::CLI) +BuildRequires: perl(App::CLI::Command) +BuildRequires: perl(App::CLI::Command::Help) BuildRequires: perl(Archive::Extract) -BuildRequires: perl(Archive::Tar) +BuildRequires: perl(base) +BuildRequires: perl(Carp) BuildRequires: perl(Class::Accessor::Fast) -BuildRequires: perl(CPAN) +BuildRequires: perl(Config) +BuildRequires: perl(CPAN) >= 1.9205 +# CPAN::Config is optional BuildRequires: perl(CPAN::DistnameInfo) -BuildRequires: perl(ExtUtils::MakeMaker) +# CPAN::MyConfig is optional +BuildRequires: perl(Cwd) +BuildRequires: perl(Data::Dumper) +BuildRequires: perl(Exporter) +BuildRequires: perl(File::Basename) +# File::Compare not used at tests +BuildRequires: perl(File::Copy) BuildRequires: perl(File::Copy::Recursive) +BuildRequires: perl(File::Find) +BuildRequires: perl(File::Path) >= 2.07 BuildRequires: perl(File::Slurp) +# File::Spec not used at tests +BuildRequires: perl(File::Spec::Functions) +BuildRequires: perl(File::Temp) >= 0.18 BuildRequires: perl(File::Which) -BuildRequires: perl(IO::Uncompress::Bunzip2) -BuildRequires: perl(IO::Uncompress::RawInflate) >= 2.012 +BuildRequires: perl(Getopt::Long) BuildRequires: perl(IPC::Cmd) BuildRequires: perl(IPC::Run3) +BuildRequires: perl(lib) BuildRequires: perl(List::MoreUtils) BuildRequires: perl(Log::Log4perl) -BuildRequires: perl(LWP::UserAgent) -BuildRequires: perl(Test::More) +# LWP::UserAgent not used at tests BuildRequires: perl(Module::Build) -BuildRequires: perl(Module::Build::Version) BuildRequires: perl(Module::CoreList) BuildRequires: perl(Module::Info) +BuildRequires: perl(Scalar::Util) +BuildRequires: perl(Test::More) +# Tie::File not used at tests BuildRequires: perl(UNIVERSAL::require) BuildRequires: perl(version) BuildRequires: perl(YAML::Tiny) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(Algorithm::Dependency::Ordered) Requires: perl(Algorithm::Dependency::Source::HoA) -Requires: perl(Archive::Tar) -Requires: perl(IO::Uncompress::Bunzip2) -Requires: perl(IO::Uncompress::RawInflate) >= 2.012 +Requires: perl(CPAN) >= 1.9205 +Requires: perl(File::Compare) +Requires: perl(File::Path) >= 2.07 +Requires: perl(File::Temp) >= 0.18 Requires: perl(LWP::UserAgent) -Requires: perl(Module::Build::Version) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(Test::More) +Requires: perl(Tie::File)
-# a wrong Requires -%global __requires_exclude perl\(that\)\s*$ +# Filter under-specified dependencies +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\((File::Path|File::Temp)\)$
%description Shipwright is a tool to help you bundle your software with all its dependencies, @@ -54,30 +89,37 @@ Shipwright makes the bundle work easy.
%prep %setup -q -n Shipwright-%{version} +%patch0 -p1 +%patch1 -p1 +# Remove bundled modules +rm -rf ./inc +sed -i -e '/^inc//d' MANIFEST +# Fix shellbangs unnoticed by build script +sed -i -e 's|#!perl|%(perl -MConfig -e 'print $Config{startperl}')|' \ + share/bin/* share/etc/*
%build -%{__perl} Makefile.PL INSTALLDIRS=vendor +perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags}
%install -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT - +make pure_install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ; -find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ; - %{_fixperms} $RPM_BUILD_ROOT/*
%check make test %{?_smp_mflags}
%files -%defattr(-,root,root,-) %doc AUTHORS Changes README TODO %{_bindir}/shipwright* %{perl_vendorlib}/* %{_mandir}/man3/*
%changelog +* Fri Jun 12 2015 Petr Pisar ppisar@redhat.com - 2.4.41-1 +- 2.4.41 bump + * Mon Jun 08 2015 Jitka Plesnikova jplesnik@redhat.com - 2.4.33-9 - Perl 5.22 rebuild
diff --git a/sources b/sources index 2041714..10e40dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9862d7a7506e087bb10f276fd4e7282 Shipwright-2.4.33.tar.gz +c455ceb49f6a26bc8e890af0a34c9266 Shipwright-2.4.41.tar.gz
perl-devel@lists.fedoraproject.org
-
notifications＠fedoraproject.org