From c75314276133b13ec21ba632fdb110b75ab97b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 31 Jul 2014 16:06:25 +0200 Subject: [PATCH] 0.44 bump --- .gitignore | 1 + perl-Pegex.spec | 59 ++++++++++++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 41 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 925820f..db9eeda 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ Pegex-0.11.tar.gz /Pegex-0.21.tar.gz +/Pegex-0.44.tar.gz diff --git a/perl-Pegex.spec b/perl-Pegex.spec index 60ff342..b6e681f 100644 --- a/perl-Pegex.spec +++ b/perl-Pegex.spec @@ -1,32 +1,45 @@ +# Bootstrap perl-Pegex → perl-TestML +%global perl_bootstrap 1 + Name: perl-Pegex -Version: 0.21 -Release: 4%{?dist} +Version: 0.44 +Release: 1%{?dist} Summary: Pegex Parser Generator License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Pegex/ Source0: http://search.cpan.org/CPAN/authors/id/I/IN/INGY/Pegex-%{version}.tar.gz BuildArch: noarch -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(inc::Module::Install) +BuildRequires: perl +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.30 +BuildRequires: perl(strict) +BuildRequires: perl(warnings) # Run-time -BuildRequires: perl(base) BuildRequires: perl(Carp) +BuildRequires: perl(constant) BuildRequires: perl(Data::Dumper) BuildRequires: perl(Exporter) BuildRequires: perl(JSON::XS) +BuildRequires: perl(overload) +BuildRequires: perl(re) +BuildRequires: perl(Scalar::Util) BuildRequires: perl(YAML::XS) # Tests -BuildRequires: perl(Capture::Tiny) -BuildRequires: perl(Cwd) -BuildRequires: perl(File::Path) -BuildRequires: perl(Test::Builder) +BuildRequires: perl(base) +BuildRequires: perl(File::Basename) +BuildRequires: perl(lib) BuildRequires: perl(Test::More) +%if !%{defined perl_bootstrap} +# Break dependency cycle: perl-Pegex → perl-TestML → perl-Pegex +BuildRequires: perl(TestML) +BuildRequires: perl(TestML::Bridge) +BuildRequires: perl(TestML::Compiler::Lite) +BuildRequires: perl(TestML::Util) +%endif Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(Carp) Requires: perl(Data::Dumper) -Requires: perl(Exporter) Requires: perl(JSON::XS) +Requires: perl(warnings) Requires: perl(YAML::XS) %description @@ -37,31 +50,37 @@ modern programming languages. %prep %setup -q -n Pegex-%{version} +# Remove bundled modules +rm -r ./inc +sed -i -e '/^inc\//d' MANIFEST %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT - -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 {} \; +%{_fixperms} $RPM_BUILD_ROOT/* %check +%if %{defined perl_bootstrap} +# Break dependency cycle: perl-Pegex → perl-TestML → perl-Pegex +make test TEST_FILES="$(find t -name '*.t' \ + \! -exec grep -q -e 'use TestML' {} \; -print | tr \"\\n\" ' ')" +%else make test - -%clean -rm -rf $RPM_BUILD_ROOT +%endif %files -%defattr(-,root,root,-) -%doc Changes README +%doc Changes CONTRIBUTING LICENSE README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Thu Jul 31 2014 Petr Pisar - 0.44-1 +- 0.44 bump + * Sat Jun 07 2014 Fedora Release Engineering - 0.21-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 7caa939..b36c52a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8057e9022b95e27e0ba9c92bc3a0daec Pegex-0.21.tar.gz +421c98bb37db95f610fa0d6d22e697d6 Pegex-0.44.tar.gz