Author: pghmcfc
Update of /cvs/pkgs/rpms/perl-RRD-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9339
Modified Files:
perl-RRD-Simple.spec
Log Message:
- Cosmetic clean-up of spec
- Mark RRD::Simple::Examples POD as %doc
- Run test suite in "C" locale for spec compatibility with old distributions
- Simplify provides/requires filter
- Fix versioned provide for perl(RRD::Simple)
Index: perl-RRD-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-RRD-Simple/devel/perl-RRD-Simple.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-RRD-Simple.spec 3 Mar 2010 12:33:17 -0000 1.13
+++ perl-RRD-Simple.spec 3 Mar 2010 14:05:01 -0000 1.14
@@ -1,35 +1,28 @@
-Name: perl-RRD-Simple
-Version: 1.44
-Release: 5%{?dist}
-Summary: Simple interface to create and store data in RRD files
-
-Group: Development/Libraries
-License: ASL 2.0
-URL: http://search.cpan.org/dist/RRD-Simple
-Source0: http://search.cpan.org/CPAN/authors/id/N/NI/NICOLAW/RRD-Simple-%{version}.tar.gz
-Patch0: RRD-Simple-1.44-pod.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch: noarch
-BuildRequires: perl(Module::Build)
-BuildRequires: perl(RRDs)
-BuildRequires: perl(Test::More)
-
-# For improved tests:
-BuildRequires: perl(Test::Pod::Coverage)
-BuildRequires: perl(Test::Pod)
-
+Name: perl-RRD-Simple
+Version: 1.44
+Release: 5%{?dist}
+Summary: Simple interface to create and store data in RRD files
+Group: Development/Libraries
+License: ASL 2.0
+URL: http://search.cpan.org/dist/RRD-Simple
+Source0: http://search.cpan.org/CPAN/authors/id/N/NI/NICOLAW/RRD-Simple-%{version}.tar.gz
+Patch0: RRD-Simple-1.44-pod.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+BuildRequires: perl(Module::Build)
+BuildRequires: perl(RRDs)
+BuildRequires: perl(Test::More)
+BuildRequires: perl(Test::Pod)
+BuildRequires: perl(Test::Pod::Coverage)
# https://rt.cpan.org/Public/Bug/Display.html?id=46193
BuildConflicts: perl(Test::Deep)
-
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $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
-module. It does however create RRD files with a sensible set of default RRA
-Round Robin Archive) definitions, and can dynamically add new data source
+does not currently offer the fetch method that is available in the RRDs
+module. It does, however, create RRD files with a sensible set of default RRA
+Round Robin Archive) definitions, and can dynamically add new data source
names to an existing RRD file.
This module is ideal for quick and simple storage of data within an RRD file
@@ -38,66 +31,59 @@ if you do not need to, nor want to, both
%prep
%setup -q -n RRD-Simple-%{version}
-# fix broken POD (CPAN RT#50868)
+# Fix broken POD (CPAN RT#50868)
%patch0 -p1
-# note we first filter out the bits in _docdir...
-cat << \EOF > %{name}-prov
-#!/bin/sh
-FOO=`perl -p -e 's|%{_docdir}/%{name}-%{version}\S+||'`
-%{__perl_provides} $FOO
-EOF
-
-%define __perl_provides %{_builddir}/RRD-Simple-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'`
-EOF
-
-%define __perl_requires %{_builddir}/RRD-Simple-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
+# Don't want provides/requires from %{_docdir}
+%global docfilt %{__perl} -p -e 's|%{_docdir}/%{name}-%{version}\\S+||'
+# RRD::Simple version should be from distribution version, not svn revision
+%global verfilt %{__perl} -pi -e 's/(perl\\(RRD::Simple\\) =) \\d+/\\1 %{version}/'
+# Apply provides/requires filters
+%global provfilt /bin/sh -c "%{docfilt} | %{__perl_provides} | %{verfilt}"
+%define __perl_provides %{provfilt}
+%global reqfilt /bin/sh -c "%{docfilt} | %{__perl_requires}"
+%define __perl_requires %{reqfilt}
%build
-# prevent call-home query/timeout. not strictly necessary
+# Prevent call-home query/timeout; not strictly necessary
AUTOMATED_TESTING=1 %{__perl} Build.PL installdirs=vendor
./Build
-
%install
-rm -rf %{buildroot}
-
+%{__rm} -rf %{buildroot}
./Build install destdir=%{buildroot} create_packlist=0
-find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
-
-%{_fixperms} %{buildroot}/*
-
+/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} ';' 2>/dev/null
+%{_fixperms} %{buildroot}
%check
-./Build test
-
+LC_ALL=C ./Build test
%clean
-rm -rf %{buildroot}
-
+%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc Changes INSTALL LICENSE NOTICE README examples/ t/
-%{perl_vendorlib}/*
-%{_mandir}/man3/*.3*
-
+%dir %{perl_vendorlib}/RRD/
+%dir %{perl_vendorlib}/RRD/Simple/
+%{perl_vendorlib}/RRD/Simple.pm
+%doc %{perl_vendorlib}/RRD/Simple/Examples.pod
+%{_mandir}/man3/RRD::Simple.3pm*
+%{_mandir}/man3/RRD::Simple::Examples.3pm*
%changelog
* Wed Mar 3 2010 Paul Howarth <paul@xxxxxxxxxxxx> - 1.44-5
- Change buildreq perl(Test::Deep) to a build conflict until upstream fixes
failing t/32exported_function_interface.t (#464964, CPAN RT#46193)
- Fix broken POD (CPAN RT#50868)
+- Cosmetic clean-up of spec
+- Mark RRD::Simple::Examples POD as %%doc
+- Run test suite in "C" locale for spec compatibility with old distributions
+- Simplify provides/requires filter
+- Fix versioned provide for perl(RRD::Simple)
* Mon Dec 7 2009 Stepan Kasal <skasal@xxxxxxxxxx> - 1.44-4
-- rebuild against perl 5.10.1
+- Rebuild against perl 5.10.1
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 1.44-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -105,32 +91,32 @@ rm -rf %{buildroot}
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 1.44-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-* Sun Aug 03 2008 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 1.44-1
-- update to 1.44
+* Sun Aug 03 2008 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> - 1.44-1
+- Update to 1.44
* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa@xxxxxxxxxx> - 1.43-3
-Rebuild for new perl
+- Rebuild for new perl
-* Fri Jan 11 2008 Ralf Corsépius <rc040203@xxxxxxxxxx> 1.43-2
-- BR: perl(Test::More) (BZ 419631).
-- BR: perl(Test::Pod), perl(Test::Pod::Coverage).
+* Fri Jan 11 2008 Ralf Corsépius <rc040203@xxxxxxxxxx> - 1.43-2
+- BR: perl(Test::More) (BZ 419631)
+- BR: perl(Test::Pod), perl(Test::Pod::Coverage)
-* Wed Mar 21 2007 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 1.43-1
-- update to 1.43
+* Wed Mar 21 2007 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> - 1.43-1
+- Update to 1.43
-* Tue Feb 13 2007 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 1.41-1
-- update to 1.41
-- use Build.PL directly
+* Tue Feb 13 2007 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> - 1.41-1
+- Update to 1.41
+- Use Build.PL directly
-* Thu Aug 31 2006 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 1.40-2
-- bump for mass rebuild
+* Thu Aug 31 2006 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> - 1.40-2
+- Bump for mass rebuild
-* Fri Aug 25 2006 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 1.40-1
-- update to 1.40
-- minor spec cleanups
+* Fri Aug 25 2006 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> - 1.40-1
+- Update to 1.40
+- Minor spec cleanups
-* Tue Jun 27 2006 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 1.39-1
-- bump release for extras build
+* Tue Jun 27 2006 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> - 1.39-1
+- Bump release for extras build
-* Tue Jun 27 2006 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 1.39-0
+* Tue Jun 27 2006 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> - 1.39-0
- Initial spec file for F-E
--
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
