diff --git a/po4a-0.44-run-po4a-from-local-dir.patch b/po4a-0.44-run-po4a-from-local-dir.patch deleted file mode 100644 index cb170c9..0000000 --- a/po4a-0.44-run-po4a-from-local-dir.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- po4a-0.44/Po4aBuilder.pm.old 2013-07-29 17:13:54.974419735 +0100 -+++ po4a-0.44/Po4aBuilder.pm 2013-07-29 17:14:08.312408777 +0100 -@@ -166,7 +166,7 @@ - $self->depends_on('code'); - $self->make_files_writable("po/pod"); - -- my $cmd = "PERL5LIB=lib perl po4a "; # Use this version of po4a -+ my $cmd = "PERL5LIB=lib perl ./po4a "; # Use this version of po4a - $cmd .= "--previous "; - $cmd .= "--no-translations "; - $cmd .= "--msgid-bugs-address po4a-devel\@lists.alioth.debian.org "; -@@ -190,7 +190,7 @@ - $options{utf8} = 1; - my $parser = Pod::Man->new (%options); - -- my $cmd = "PERL5LIB=lib perl po4a "; # Use this version of po4a -+ my $cmd = "PERL5LIB=lib perl ./po4a "; # Use this version of po4a - $cmd .= $ENV{PO4AFLAGS}." " if defined($ENV{PO4AFLAGS}); - $cmd .= "--previous po/pod.cfg"; - system($cmd) and die; diff --git a/po4a.spec b/po4a.spec index 10970c0..757a4b6 100644 --- a/po4a.spec +++ b/po4a.spec @@ -1,6 +1,6 @@ Name: po4a Version: 0.44 -Release: 4%{?dist} +Release: 3%{?dist} Summary: A tool maintaining translations anywhere License: GPL+ URL: http://alioth.debian.org/projects/po4a/ @@ -9,8 +9,6 @@ Source0: http://alioth.debian.org/frs/download.php/3723/%{name}-%{version}.tar.g Patch0: 0001-Remove-defined-anachronism.patch # Patch sent upstream on 2013-04-17. Patch1: po4a-0.44-use-tempfile-correctly.patch -# Patch sent upstream on 2013-07-29. -Patch2: po4a-0.44-run-po4a-from-local-dir.patch BuildArch: noarch BuildRequires: perl(Module::Build) @@ -49,7 +47,6 @@ tools on areas where they were not expected like documentation. %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build %{__perl} ./Build.PL installdirs=vendor @@ -91,9 +88,8 @@ find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' %{_mandir}/*/man7/po4a-runtime.7* %changelog -* Mon Jul 29 2013 Richard W.M. Jones - 0.44-4 +* Mon Jul 29 2013 Richard W.M. Jones - 0.44-3 - Fix bang path /usr/bin/env perl -> %{_bindir}/perl (RHBZ#987035). -- When building, run po4a from local directory, not installed copy. * Thu Jul 18 2013 Petr Pisar - 0.44-2 - Perl 5.18 rebuild