[perl-Config-Model] Remove BuildRoot and clean macro (no longer used) Add perl default filter Filter out uneeded require
Emmanuel Seyman
eseyman at fedoraproject.org
Fri Apr 8 10:21:12 UTC 2011
commit a53841a427cad69d2fd5d5a02d7400e93190961c
Author: Emmanuel Seyman <emmanuel.seyman at club-internet.fr>
Date: Thu Apr 7 15:54:50 2011 +0200
Remove BuildRoot and clean macro (no longer used)
Add perl default filter
Filter out uneeded requirements
Update and apply patch for YAML::Any requirement
Config-Model-1.205-yamlreq.patch | 25 -------------------------
Config-Model-1.235-yamlreq.patch | 24 ++++++++++++++++++++++++
perl-Config-Model.spec | 21 ++++++++++++++++-----
3 files changed, 40 insertions(+), 30 deletions(-)
---
diff --git a/Config-Model-1.235-yamlreq.patch b/Config-Model-1.235-yamlreq.patch
new file mode 100644
index 0000000..5f4d436
--- /dev/null
+++ b/Config-Model-1.235-yamlreq.patch
@@ -0,0 +1,24 @@
+diff -up Config-Model-1.235/Build.PL.old Config-Model-1.235/Build.PL
+--- Config-Model-1.235/Build.PL.old 2011-04-07 15:37:58.000000000 +0200
++++ Config-Model-1.235/Build.PL 2011-04-07 15:38:10.000000000 +0200
+@@ -80,7 +80,7 @@ my $build = Module::Build -> new
+ 'Scalar::Util' => '0',
+ 'Term::ReadLine' => '0',
+ 'Text::Autoformat' => '0',
+- 'YAML::Any' => '0.303'
++ 'YAML::Any' => '0.70'
+ },
+
+ meta_merge => {
+diff -up Config-Model-1.235/lib/Config/Model/Backend/Yaml.pm.old Config-Model-1.235/lib/Config/Model/Backend/Yaml.pm
+--- Config-Model-1.235/lib/Config/Model/Backend/Yaml.pm.old 2011-04-07 15:38:23.000000000 +0200
++++ Config-Model-1.235/lib/Config/Model/Backend/Yaml.pm 2011-04-07 15:38:36.000000000 +0200
+@@ -22,7 +22,7 @@ use File::Path;
+ use Log::Log4perl qw(get_logger :levels);
+
+ use base qw/Config::Model::Backend::Any/;
+-use YAML::Any 0.303 ;
++use YAML::Any 0.70 ;
+
+
+ my $logger = get_logger("Backend::Yaml") ;
diff --git a/perl-Config-Model.spec b/perl-Config-Model.spec
index cbb8cd3..5e6b486 100644
--- a/perl-Config-Model.spec
+++ b/perl-Config-Model.spec
@@ -1,12 +1,12 @@
Name: perl-Config-Model
Version: 1.235
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Framework to create configuration validation tools and editors
License: LGPLv2+
Group: Development/Libraries
URL: http://search.cpan.org/dist/Config-Model/
Source0: http://www.cpan.org/authors/id/D/DD/DDUMONT/Config-Model-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: Config-Model-1.235-yamlreq.patch
BuildArch: noarch
BuildRequires: perl(Carp::Assert::More)
BuildRequires: perl(Config::Tiny)
@@ -28,6 +28,13 @@ BuildRequires: perl(Path::Class) >= 0.18
BuildRequires: perl(Probe::Perl) >= 0.01
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Fuse is recommanded, not required
+%filter_from_requires /perl(Fuse)/d;
+# Fedora is not a Debian system
+%filter_from_requires /perl(AptPkg::Config)/d; /perl(AptPkg::System)/d; /perl(AptPkg::Version)/d
+
+%{?perl_default_filter}
+
%description
Using Config::Model, a typical configuration validation tool will be made
of 3 parts :
@@ -38,6 +45,7 @@ configuration information provided by the user.
%prep
%setup -q -n Config-Model-%{version}
+%patch0 -p1
%build
%{__perl} Build.PL installdirs=vendor
@@ -54,9 +62,6 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
%check
./Build test
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root,-)
%doc ChangeLog config-edit examples LICENSE MODELS README TODO
@@ -66,6 +71,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/*
%changelog
+* Thu Apr 07 2011 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.235-2
+- Remove BuildRoot and clean macro (no longer used)
+- Add perl default filter
+- Filter out uneeded requirements
+- Update and apply patch for YAML::Any requirement
+
* Tue Mar 08 2011 David Hannequin <david.hannequin at gmail.com> 1.235-1
- Update from upstream.
More information about the scm-commits
mailing list