rpms/perl-JSON/devel perl-JSON.spec,1.15,1.16

[Chris Weyl]

Author: cweyl

Update of /cvs/extras/rpms/perl-JSON/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24663

Modified Files:
	perl-JSON.spec 
Log Message:
* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.15-3
- update filtering 



Index: perl-JSON.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON/devel/perl-JSON.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-JSON.spec	26 Jul 2009 08:49:59 -0000	1.15
+++ perl-JSON.spec	1 Sep 2009 04:06:27 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-JSON
 Version:        2.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Parse and convert to JSON (JavaScript Object Notation)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -27,29 +27,28 @@ Requires:       perl(Scalar::Util)
 Requires:       perl(LWP::UserAgent)
 Requires:       perl(HTTP::Daemon)
 
+# use the whole kit-n-kaboodle, as perl_default_filter isn't in F-11
+%{?filter_setup: %{expand: 
+%filter_from_provides /perl(JSON::PP)/d
+%filter_provides_in %{perl_vendorarch}/.*\\.so$ 
+%filter_provides_in -P %{perl_archlib}/(?!CORE/libperl).*\\.so$ 
+%filter_provides_in %{_docdir} 
+%filter_requires_in %{_docdir} 
+%filter_setup 
+}}
+
 %description
 This module converts between JSON (JavaScript Object Notation) and Perl
-data structure into each other. For JSON, See to
-http://www.crockford.com/JSON/.
+data structure into each other. For JSON, see http://www.crockford.com/JSON/.
 
 %prep
 %setup -q -n JSON-%{version}
 
 # make rpmlint happy...
 find .  -type f -exec chmod -c -x {} +
-find t/ -type f -exec perl -pi -e 's|^#! perl|#!/usr/bin/perl|' {} +
+find t/ -type f -exec perl -pi -e 's|^#! perl|#!%{__perl}|' {} +
 sed -i 's/\r//' README t/*
 
-# Filter unwanted Provides:
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-  sed -e '/perl(My.*)/d; /perl(_unicode_handling)/d'
-EOF
-
-%define __perl_provides %{_builddir}/JSON-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -77,6 +76,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.15-3
+- update filtering 
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild