From b5cd8e0a8a021719d67727aff3d446c131ce114c Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Mon, 4 Sep 2006 19:00:30 +0000 Subject: [PATCH] Rework spec to look more like current cpanspec output. --- Spiffy-filter-provides.sh | 3 +++ perl-Spiffy.spec | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 Spiffy-filter-provides.sh diff --git a/Spiffy-filter-provides.sh b/Spiffy-filter-provides.sh new file mode 100644 index 0000000..c7d6fa7 --- /dev/null +++ b/Spiffy-filter-provides.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +@@PERL_PROV@@ "$@" | sed -e '/^perl(DB)$/d' diff --git a/perl-Spiffy.spec b/perl-Spiffy.spec index 060e1d4..6005f5e 100644 --- a/perl-Spiffy.spec +++ b/perl-Spiffy.spec @@ -1,6 +1,6 @@ Name: perl-Spiffy Version: 0.30 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Framework for doing object oriented (OO) programming in Perl License: GPL or Artistic Group: Development/Libraries @@ -10,6 +10,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source99: Spiffy-filter-provides.sh +%global real_perl_provides %{__perl_provides} +%define __perl_provides %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-provides + %description "Spiffy" is a framework and methodology for doing object oriented (OO) programming in Perl. Spiffy combines the best parts of Exporter.pm, @@ -20,11 +24,7 @@ straightforward and (perhaps someday) standard way. %prep %setup -q -n Spiffy-%{version} -cat <<'END' > %{_sourcedir}/%{name}-prov -#!/bin/sh -%{__perl_provides} "$@" | sed -e '/^perl(DB)$/d' -END -%define __perl_provides %{_sourcedir}/%{name}-prov +sed -e 's,@@PERL_PROV@@,%{real_perl_provides},' %{SOURCE99} > %{__perl_provides} chmod +x %{__perl_provides} %build @@ -37,26 +37,26 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_provides} %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Mon Sep 04 2006 Steven Pritchard 0.30-6 +- Rework spec to look more like current cpanspec output. + * Tue Feb 28 2006 Steven Pritchard 0.30-5 - Improve filter.