From 8c82ba6640555df342e632a0a11f98853036247b Mon Sep 17 00:00:00 2001 From: Petr Šabata Date: Dec 01 2014 16:03:11 +0000 Subject: Merge branch 'master' into el6 --- diff --git a/cpanspec-1.78-Change-optimize-to-optflags.patch b/cpanspec-1.78-Change-optimize-to-optflags.patch new file mode 100644 index 0000000..cc726ba --- /dev/null +++ b/cpanspec-1.78-Change-optimize-to-optflags.patch @@ -0,0 +1,29 @@ +From b0bdaf235941165e74d5db24a9f87fdb4bcf57ce Mon Sep 17 00:00:00 2001 +From: Gavin Carr +Date: Tue, 8 Feb 2011 16:40:02 +0000 +Subject: [PATCH] Change %{optimize} to %{optflags}. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Petr Šabata +--- + cpanspec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cpanspec b/cpanspec +index 5eaa63d..7b697ff 100755 +--- a/cpanspec ++++ b/cpanspec +@@ -265,7 +265,7 @@ my @MACROS = ( + + # 1 is for the macros. + { +- 'optimize' => '%{optimize}', ++ 'optimize' => '%{optflags}', + 'buildroot' => '%{buildroot}', + }, + ); +-- +1.9.3 + diff --git a/cpanspec-1.78-Escape-slashes-in-filters.patch b/cpanspec-1.78-Escape-slashes-in-filters.patch new file mode 100644 index 0000000..b31b0d4 --- /dev/null +++ b/cpanspec-1.78-Escape-slashes-in-filters.patch @@ -0,0 +1,41 @@ +From 1052ae3f560cfb31a540fbf3ab1fe5d3343094a8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20=C5=A0abata?= +Date: Thu, 6 Nov 2014 16:51:47 +0100 +Subject: [PATCH] Escape slashes in filters +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Simply escape slashes in --filter-requires and --filter-provides +options, resolving a five year old bug [0]. + +[0] https://bugzilla.redhat.com/show_bug.cgi?id=544738 + +Signed-off-by: Petr Šabata +--- + cpanspec | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/cpanspec b/cpanspec +index d972d1c..398e0de 100755 +--- a/cpanspec ++++ b/cpanspec +@@ -823,6 +823,7 @@ for my $file (@args) { + } + die "Failed to create $script: $!\n" if (!$sh); + ++ map { s/\//\\\//g } @filter_requires; + print $sh "#!/bin/sh\n\n" + . "\@\@PERL_REQ\@\@ \"\$\@\" | sed -e '/^$filter_requires[0]\$/d'"; + if (@filter_requires > 1) { +@@ -845,6 +846,7 @@ for my $file (@args) { + } + die "Failed to create $script: $!\n" if (!$sh); + ++ map { s/\//\\\//g } @filter_provides; + print $sh "#!/bin/sh\n\n" + . "\@\@PERL_PROV\@\@ \"\$\@\" | sed -e '/^$filter_provides[0]\$/d'"; + if (@filter_provides > 1) { +-- +1.9.3 + diff --git a/cpanspec-1.78-Strip-any-version-comparison-operator-from-the-perl-BR.patch b/cpanspec-1.78-Strip-any-version-comparison-operator-from-the-perl-BR.patch new file mode 100644 index 0000000..ece4ea2 --- /dev/null +++ b/cpanspec-1.78-Strip-any-version-comparison-operator-from-the-perl-BR.patch @@ -0,0 +1,33 @@ +From c406955800472398c0105c72f46ba5b73ade5597 Mon Sep 17 00:00:00 2001 +From: Dennis Kaarsemaker +Date: Fri, 19 Aug 2011 08:23:50 +0200 +Subject: [PATCH] Strip any version comparison operator from the 'perl' build + requirement +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Because cpanspec does things with the epoch, and already adds version +comparison operators itself, they should be stripped from whatever +META.yml specifies so cpanspec does not generate invalid spec files. + +Signed-off-by: Petr Šabata +--- + cpanspec | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cpanspec b/cpanspec +index 8e9334a..f7fc1fc 100755 +--- a/cpanspec ++++ b/cpanspec +@@ -1015,6 +1015,7 @@ END + } + + if (defined($build_requires{perl})) { ++ $build_requires{perl} =~ s/^[<>=]+ *//; + printf $spec "%-16s%s >= %s\n", "BuildRequires:", "perl", + (($build_requires{perl} lt "5.6.0" ? "0:" : "1:") + . $build_requires{perl}) if $build_requires{perl}; +-- +1.9.3 + diff --git a/cpanspec.spec b/cpanspec.spec index 7f50b0a..9f865a4 100644 --- a/cpanspec.spec +++ b/cpanspec.spec @@ -1,11 +1,14 @@ Name: cpanspec Version: 1.78 -Release: 6%{?dist} +Release: 19%{?dist} Summary: RPM spec file generation utility License: GPL+ or Artistic Group: Development/Tools URL: http://cpanspec.sourceforge.net/ Source0: http://sourceforge.net/downloads/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz +Patch0: %{name}-1.78-Change-optimize-to-optflags.patch +Patch1: %{name}-1.78-Strip-any-version-comparison-operator-from-the-perl-BR.patch +Patch2: %{name}-1.78-Escape-slashes-in-filters.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) @@ -24,6 +27,9 @@ contained in the spec file is correct. %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %{__perl} Build.PL installdirs=vendor @@ -31,12 +37,9 @@ contained in the spec file is correct. %install rm -rf $RPM_BUILD_ROOT - ./Build 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/* # No tests. @@ -53,6 +56,46 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Mon Dec 01 2014 Petr Šabata - 1.78-19 +- Escape slashes in filters (#544738) + +* Thu Nov 06 2014 Petr Šabata - 1.78-18 +- Use %%{optflags} instead of %%{optimize} (#739461, b0bdaf23) +- Strip META perl version BR (#708377, c4069558) + +* Tue Aug 26 2014 Jitka Plesnikova - 1.78-17 +- Perl 5.20 rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.78-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 1.78-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 17 2013 Petr Pisar - 1.78-14 +- Perl 5.18 rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 1.78-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 1.78-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jun 07 2012 Petr Pisar - 1.78-11 +- Perl 5.16 rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 1.78-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Jun 20 2011 Marcela Mašláňová - 1.78-9 +- Perl mass rebuild + +* Thu Jun 09 2011 Marcela Mašláňová - 1.78-8 +- Perl 5.14 mass rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 1.78-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Jun 22 2010 Petr Pisar - 1.78-6 - Rebuild against perl-5.12 - Fix Source0 URL