rpms/perl-Template-Toolkit/devel perl-Template-Toolkit.spec, 1.17, 1.18

[Štěpán Kasal]

Author: kasal

Update of /cvs/extras/rpms/perl-Template-Toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7569

Modified Files:
	perl-Template-Toolkit.spec 
Log Message:
- use filtering macros


Index: perl-Template-Toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Toolkit/devel/perl-Template-Toolkit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Template-Toolkit.spec	15 Jan 2010 14:20:08 -0000	1.17
+++ perl-Template-Toolkit.spec	15 Jan 2010 20:24:05 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit
 Version:        2.22
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Template processing system
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -17,6 +17,11 @@ Requires:  perl(:MODULE_COMPAT_%(eval "`
 Provides:       perl-Template-Toolkit-examples = %{version}-%{release}
 Obsoletes:      perl-Template-Toolkit-examples < 2.22-1
 
+%{?filter_setup:
+%filter_from_provides /^perl(bytes)$/d
+%?perl_default_filter
+}
+
 %description
 The Template Toolkit is a collection of modules which implement a
 fast, flexible, powerful and extensible template processing system.
@@ -30,18 +35,6 @@ LaTeX, and so on.
 find lib -type f | xargs chmod -c -x
 find TT_v*_html_docs -depth -name .svn -type d -exec rm -rf {} \;
 
-# Filter false positive provides.
-cat <<EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} \
-| grep -v 'perl(bytes)' \
-| grep -v 'perl(CGI)' \
-| grep -v 'perl(XML::DOM::' \
-| grep -v 'perl(XML::XPath::'
-EOF
-%define __perl_provides %{_builddir}/Template-Toolkit-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
 # Convert file to UTF-8
 iconv -f iso-8859-1 -t utf-8 -o Changes{.utf8,}
 mv Changes{.utf8,}
@@ -58,10 +51,9 @@ make install \
   PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
   INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib} \
   TT_PREFIX=$RPM_BUILD_ROOT%{_datadir}/tt2
-find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
+find $RPM_BUILD_ROOT -type f \( -name perllocal.pod -o \
+	-name .packlist -o -name '*.bs' -size 0 \) -exec rm {} ';'
+find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir {} ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 # Nuke buildroot where it hides
 sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{perl_vendorarch}/Template/Config.pm
@@ -84,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Jan 15 2010 Stepan Kasal <skasal at redhat.com> - 2.22-4
+- use filtering macros
+
 * Fri Jan 15 2010 Stepan Kasal <skasal at redhat.com> - 2.22-3
 - drop build requirements for TeX; LaTeX support has been removed in 2.14a
 - fix the Obsoletes tag