[perl-File-Find-Rule-Perl] Revert parts of previous changes.

corsepiu corsepiu at fedoraproject.org
Wed Nov 7 08:14:35 UTC 2012


commit 98fc3d1ce3202c394fc3fbf4a918538e6b754e5d
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Wed Nov 7 09:14:23 2012 +0100

    Revert parts of previous changes.
    
    - Upstream update.

 .gitignore                    |    1 +
 perl-File-Find-Rule-Perl.spec |   34 +++++++++++++++++++++-------------
 sources                       |    2 +-
 3 files changed, 23 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f439b26..eed2af6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /File-Find-Rule-Perl-1.12.tar.gz
+/File-Find-Rule-Perl-1.13.tar.gz
diff --git a/perl-File-Find-Rule-Perl.spec b/perl-File-Find-Rule-Perl.spec
index 453d4be..28081ae 100644
--- a/perl-File-Find-Rule-Perl.spec
+++ b/perl-File-Find-Rule-Perl.spec
@@ -1,6 +1,6 @@
 Name:           perl-File-Find-Rule-Perl
-Version:        1.12
-Release:        6%{?dist}
+Version:        1.13
+Release:        1%{?dist}
 Summary:        Common rules for searching for Perl things
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -9,7 +9,6 @@ Source0:        http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/File-Find-Rule
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 BuildArch:      noarch
 BuildRequires:  perl(constant)
-BuildRequires:  perl(inc::Module::Install::DSL) >= 1.00
 BuildRequires:  perl(lib)
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -18,7 +17,7 @@ BuildRequires:  perl(File::Spec) >= 0.82
 BuildRequires:  perl(File::Spec::Functions)
 BuildRequires:  perl(File::Spec::Unix)
 BuildRequires:  perl(Params::Util) >= 0.38
-BuildRequires:  perl(Parse::CPAN::Meta) >= 0.04
+BuildRequires:  perl(Parse::CPAN::Meta) >= 1.38
 BuildRequires:  perl(Test::More) >= 0.47
 # For improved tests
 %if !%{defined perl_bootstrap}
@@ -32,31 +31,40 @@ BuildRequires:  perl(Test::CPAN::Meta) >= 0.17
 Common rules for searching for Perl things.
 
 %prep
-%setup -q -n File-Find-Rule-Perl-%{version}
-rm -rf inc
+%setup -q -T -c
+%setup -q -T -D -a0
 
 %build
-perl Makefile.PL INSTALLDIRS=vendor
+cd File-Find-Rule-Perl-%{version}
+%{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
+cd ..
 
 %install
-make pure_install PERL_INSTALL_ROOT=%{buildroot}
-find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w %{buildroot}/*
+cd File-Find-Rule-Perl-%{version}
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+cd ..
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
+chmod -R u+w $RPM_BUILD_ROOT/*
 
 %check
-rm -f debug*.list
 %if !%{defined perl_bootstrap}
+cd File-Find-Rule-Perl-%{version}
 make test AUTOMATED_TESTING=1
+cd ..
 %endif
 
 %files
-%doc Changes LICENSE
+%doc File-Find-Rule-Perl-%{version}/Changes File-Find-Rule-Perl-%{version}/LICENSE
 %{perl_vendorlib}/File
 %{_mandir}/man3/*
 
 %changelog
+* Wed Nov 07 2012 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.13-1
+- Revert parts of previous changes.
+- Upstream update.
+
 * Tue Oct 23 2012 Petr Šabata <contyk at redhat.com> - 1.12-6
 - Specify all dependencies
 - Modernize specfile
diff --git a/sources b/sources
index facecd5..d5c7949 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91ce1937411b5fe60b9861b0bd7cf45a  File-Find-Rule-Perl-1.12.tar.gz
+c3ee4f00f643f82fdb6f1cbcebfa90de  File-Find-Rule-Perl-1.13.tar.gz



More information about the perl-devel mailing list