commit 30a6140f196dcaab25ada4f9f3f59a3e6fb3ba6a
Author: Paul Howarth <p...@city-fan.org>
Date: Wed Jul 31 18:44:59 2013 +0100
Handle filtering of provides from unversioned doc-dirs from F-20
- Handle filtering of provides from unversioned doc-dirs from F-20
- Don't need to remove empty directories from the buildroot
perl-RRD-Simple.spec | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/perl-RRD-Simple.spec b/perl-RRD-Simple.spec
index 9f7223f..f56fffb 100644
--- a/perl-RRD-Simple.spec
+++ b/perl-RRD-Simple.spec
@@ -1,9 +1,9 @@
# Need to tweak provides/requires filters differently if we have rpm 4.9
onwards
-%global rpm49 %(rpm --version | perl -pi -e 's/^.*
(\\d+)\\.(\\d+)\\.(\\d+).*/sprintf("%d.%03d%03d",$1,$2,$3) ge 4.009 ? 1 : 0/e')
+%global rpm49 %(rpm --version | perl -p -e 's/^.*
(\\d+)\\.(\\d+)\\.(\\d+).*/sprintf("%d.%03d%03d",$1,$2,$3) ge 4.009 ? 1 : 0/e')
Name: perl-RRD-Simple
Version: 1.44
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: Simple interface to create and store data in RRD files
Group: Development/Libraries
License: ASL 2.0
@@ -26,6 +26,10 @@ BuildRequires: perl(Test::Pod::Coverage)
BuildConflicts: perl(Test::Deep)
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+# Move to unversioned documentation directories from F-20
+# https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
+%global rrd_docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
+
%description
RRD::Simple provides a simple interface to RRDTool's RRDs module. This module
does not currently offer the fetch method that is available in the RRDs
@@ -39,10 +43,10 @@ if you do not need to, nor want to, bother defining custom
RRA definitions.
%prep
%setup -q -n RRD-Simple-%{version}
-# Don't want provides/requires from %%{_docdir}
-%global docfilt perl -p -e 's|%{_docdir}/%{name}-%{version}\\S+||'
+# Don't want provides/requires from documentation
+%global docfilt perl -p -e 's|%{rrd_docdir}\\S+||'
# RRD::Simple version should be from distribution version, not svn revision
-%global verfilt perl -pi -e 's/(perl\\(RRD::Simple\\) =) \\d+/\\1 %{version}/'
+%global verfilt perl -p -e 's/(perl\\(RRD::Simple\\) =) \\d+/\\1 %{version}/'
# Apply provides/requires filters
%if %{rpm49}
%global provfilt /bin/sh -c "%{docfilt} | %{__perllib_provides} | %{verfilt}"
@@ -64,7 +68,6 @@ AUTOMATED_TESTING=1 perl Build.PL installdirs=vendor
%install
rm -rf %{buildroot}
./Build install destdir=%{buildroot} create_packlist=0
-find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null
%{_fixperms} %{buildroot}
%check
@@ -84,6 +87,10 @@ rm -rf %{buildroot}
%{_mandir}/man3/RRD::Simple::Examples.3pm*
%changelog
+* Wed Jul 31 2013 Paul Howarth <p...@city-fan.org> - 1.44-16
+- Handle filtering of provides from unversioned doc-dirs from F-20
+- Don't need to remove empty directories from the buildroot
+
* Fri Jul 26 2013 Petr Pisar <ppi...@redhat.com> - 1.44-15
- Perl 5.18 rebuild
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-de...@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
