From 42ea8298d49c390183894c280dc2600486e0eefe Mon Sep 17 00:00:00 2001
From: Steven Pritchard <steve@fedoraproject.org>
Date: Mon, 2 Apr 2007 15:37:36 +0000
Subject: [PATCH] Filter Win32::TieRegistry dependency. Do the provides filter
 like we do in     cpanspec. Drop some macro usage.

---
 DateTime-filter-provides.sh |  6 +++++
 DateTime-filter-requires.sh |  3 +++
 perl-DateTime.spec          | 47 +++++++++++++++++++++++--------------
 3 files changed, 38 insertions(+), 18 deletions(-)
 create mode 100644 DateTime-filter-provides.sh
 create mode 100644 DateTime-filter-requires.sh

diff --git a/DateTime-filter-provides.sh b/DateTime-filter-provides.sh
new file mode 100644
index 0000000..2233fab
--- /dev/null
+++ b/DateTime-filter-provides.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# Remove redundant unversioned provides of
+# perl(DateTime) and perl(DateTime::TimeZone).
+
+@@PERL_PROV@@ "$@" | sed -e '/^perl(DateTime\(::TimeZone\)\?)$/d'
diff --git a/DateTime-filter-requires.sh b/DateTime-filter-requires.sh
new file mode 100644
index 0000000..4d024a9
--- /dev/null
+++ b/DateTime-filter-requires.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+@@PERL_REQ@@ "$@" | sed -e '/^perl(Win32::.*$/d'
diff --git a/perl-DateTime.spec b/perl-DateTime.spec
index ff5d50e..6784729 100644
--- a/perl-DateTime.spec
+++ b/perl-DateTime.spec
@@ -3,7 +3,7 @@
 
 Name:           perl-DateTime
 Version:        0.37
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        Date and time objects
 License:        GPL or Artistic
@@ -31,6 +31,14 @@ Provides:       perl(DateTime::TimeZoneCatalog)
 Provides:       perl(DateTimePP)
 Provides:       perl(DateTimePPExtra)
 
+Source98:       DateTime-filter-requires.sh
+%global real_perl_requires %{__perl_requires}
+%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires
+
+Source99:       DateTime-filter-provides.sh
+%global real_perl_provides %{__perl_provides}
+%define __perl_provides %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-provides
+
 %description
 DateTime is a class for the representation of date/time combinations, and
 is part of the Perl DateTime project. For details on this project please
@@ -47,13 +55,11 @@ cd DateTime-%{version}
 %patch0 -p1
 cd -
 
-cat > filter-provides.sh << EOF
-#!/bin/sh
-# Remove redundant unversioned provides of perl(DateTime) and perl(DateTime::TimeZone)
-exec %{__perl_provides} $* | egrep -v '^perl[(]DateTime(::TimeZone)?[)]$'
-EOF
-%define __perl_provides %{_builddir}/DateTimeBundle/filter-provides.sh
-chmod 755 filter-provides.sh
+sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires}
+chmod +x %{__perl_requires}
+
+sed -e 's,@@PERL_PROV@@,%{real_perl_provides},' %{SOURCE99} > %{__perl_provides}
+chmod +x %{__perl_provides}
 
 %build
 cd DateTime-Locale-%{DTLocale_version}
@@ -70,30 +76,30 @@ cd DateTime-%{version}
 PERLLIB=../DateTime-Locale-%{DTLocale_version}/blib/lib
 PERLLIB=$PERLLIB:../DateTime-TimeZone-%{DTTimeZone_version}/blib/lib
 export PERLLIB
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
 make %{?_smp_mflags}
 cd -
 
 %install
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 cd DateTime-Locale-%{DTLocale_version}
-./Build install destdir=%{buildroot}
+./Build install destdir=$RPM_BUILD_ROOT
 cd -
 
 cd DateTime-TimeZone-%{DTTimeZone_version}
-./Build install destdir=%{buildroot}
+./Build install destdir=$RPM_BUILD_ROOT
 cd -
 
 cd DateTime-%{version}
-make pure_install PERL_INSTALL_ROOT=%{buildroot}
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 cd -
 
-find %{buildroot} -type f -name .packlist -exec rm -f {} \;
-find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
-find %{buildroot} -depth  -type d -exec rmdir {} 2>/dev/null \;
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
+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} %{buildroot}/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 # Move documentation into bundle area
 mkdir DT::Locale DT::TimeZone
@@ -120,7 +126,7 @@ cd -
 make -C DateTime-%{version} test
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT %{__perl_requires} %{__perl_provides}
 
 %files
 %defattr(-,root,root,0755)
@@ -134,6 +140,11 @@ rm -rf %{buildroot}
 %{perl_vendorarch}/DateTime*.pm
 
 %changelog
+* Mon Apr 02 2007 Steven Pritchard <steve@kspei.com> 1:0.37-2
+- Filter Win32::TieRegistry dependency.
+- Do the provides filter like we do in cpanspec.
+- Drop some macro usage.
+
 * Sat Mar 31 2007 Steven Pritchard <steve@kspei.com> 1:0.37-1
 - Update to DateTime 0.37.
 - Update to DateTime::TimeZone 0.63.