commit 2bfefc34133e742a3fe8d40ca925fb81d9828239
Author: Petr Písař <ppisar@xxxxxxxxxx>
Date: Mon Feb 27 16:39:05 2012 +0100
1.004000 bump
.gitignore | 1 +
perl-Marpa-XS.spec | 68 +++++++++++++++++++++++++++++----------------------
sources | 2 +-
3 files changed, 41 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6e2b82f..c34090b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/Marpa-XS-1.002000.tar.gz
+/Marpa-XS-1.004000.tar.gz
diff --git a/perl-Marpa-XS.spec b/perl-Marpa-XS.spec
index e0cb8c4..928cdc9 100644
--- a/perl-Marpa-XS.spec
+++ b/perl-Marpa-XS.spec
@@ -1,39 +1,52 @@
Name: perl-Marpa-XS
-Version: 1.002000
-Release: 2%{?dist}.1
+Version: 1.004000
+Release: 1%{?dist}
Summary: Language grammar parser module for Perl
License: LGPLv3+
Group: Development/Libraries
URL: http://search.cpan.org/dist/Marpa-XS/
Source0: http://www.cpan.org/authors/id/J/JK/JKEGL/Marpa-XS-%{version}.tar.gz
Patch1: 0001-Require-2.124-Data-Dumper.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: perl >= 5.10
BuildRequires: perl(ExtUtils::CBuilder) >= 0.27
-BuildRequires: perl(ExtUtils::PkgConfig) >= 1.12
-BuildRequires: perl(Glib) >= 1.223
-BuildRequires: perl(Module::Build)
-BuildRequires: perl(PPI) >= 1.206
-BuildRequires: perl(Test::More)
+BuildRequires: perl(Fatal)
+BuildRequires: perl(File::Spec) >= 0.82
BuildRequires: perl-Glib-devel
+BuildRequires: perl(Glib::Install::Files)
+BuildRequires: perl(IPC::Cmd)
+BuildRequires: perl(lib)
+BuildRequires: perl(Module::Build)
BuildRequires: perl(Time::Piece)
+# Run-time
+BuildRequires: perl >= 4:5.10
+BuildRequires: perl(Carp) >= 1.08
+BuildRequires: perl(constant)
+BuildRequires: perl(Data::Dumper) >= 2.125
+BuildRequires: perl(ExtUtils::PkgConfig) >= 1.12
+BuildRequires: perl(Glib) >= 1.223
+# Bareword Glib::Log exported from Glib probably
+BuildRequires: perl(List::Util) >= 1.21
+BuildRequires: perl(Scalar::Util) >= 1.21
+# Using ExtUtils::PkgConfig instead of perl(XSLoader)
BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: perl(IPC::Cmd)
-Requires: perl >= 5.10
-Requires: perl(ExtUtils::PkgConfig) >= 1.12
-Requires: perl(Glib) >= 1.223
-Requires: perl(PPI) >= 1.206
-Requires: perl(Data::Dumper) >= 2.124
+# Tests
+BuildRequires: perl(Getopt::Long)
+BuildRequires: perl(Test::More) >= 0.94
+BuildRequires: perl(YAML::XS)
+# Optional tests
+BuildRequires: perl(PPI) >= 1.206
+BuildRequires: perl(PPI::Document)
+BuildRequires: perl(Task::Weaken)
+# perl(Test::Weaken) >= 3.004000 not packaged yet
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# AFAIK the PPI is used at test-time only. Do not require it?
+Requires: perl(PPI) >= 1.206
Provides: perl(Marpa::XS::Version) = %{version}
-# RPM 4.8 style
-%{?filter_from_requires: %filter_from_requires /perl(Carp)$/d; }
-%{?filter_from_provides: %filter_from_provides /perl(Marpa::XS)$/d; }
%{?perl_default_filter}
-# RPM 4.9 style
-%global __requires_exclude perl\\(Carp\\)$
-%global __provides_exclude perl\\(Marpa::XS\\)$
+
+# Remove under-specified dependencies
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Carp\\)$
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Marpa::XS\\)$
%description
@@ -55,12 +68,9 @@ grammars and grammars with useless or empty productions.
%install
-rm -rf $RPM_BUILD_ROOT
-
./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
%{_fixperms} $RPM_BUILD_ROOT/*
@@ -68,12 +78,7 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
./Build test
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
-%defattr(-,root,root,-)
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Marpa*
%{_mandir}/man3/*
@@ -81,6 +86,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Feb 27 2012 Petr Pisar <ppisar@xxxxxxxxxx> - 1.004000-1
+- 1.004000 bump
+- Clean spec file
+- Declare all dependencies
+
* Mon Feb 13 2012 Lubomir Rintel (GoodData) <lubo.rintel@xxxxxxxxxxxx> 1.002000-2.1
- BR IPC::Cmd
diff --git a/sources b/sources
index e4f7f5b..8d83c3b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-28a378db21881957df71cacb9a348adb Marpa-XS-1.002000.tar.gz
+a603d2a626da672c8b293b1207f65570 Marpa-XS-1.004000.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
