commit a2732223842af47ae9d10af59a452bd2ddfd79e0
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Thu Aug 11 09:41:21 2011 +0100
Revert to same as EPEL-5 package
.gitignore | 1 -
auto.ini | 21 -------
perl-JSON.spec | 162 ++++++++++++++++----------------------------------------
sources | 2 +-
4 files changed, 47 insertions(+), 139 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2ba2ede..e69de29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +0,0 @@
-/JSON-[0-9.]*.tar.gz
diff --git a/perl-JSON.spec b/perl-JSON.spec
index 4ffb5eb..5fbe0a0 100644
--- a/perl-JSON.spec
+++ b/perl-JSON.spec
@@ -1,52 +1,69 @@
Name: perl-JSON
+Version: 2.17
+Release: 1%{?dist}
Summary: Parse and convert to JSON (JavaScript Object Notation)
-Version: 2.53
-Release: 3%{?dist}
-License: GPL+ or Artistic
+License: GPL or Artistic
Group: Development/Libraries
-Source0: http://search.cpan.org/CPAN/authors/id/M/MA/MAKAMAKA/JSON-%{version}.tar.gz
URL: http://search.cpan.org/dist/JSON/
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Source0: http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires: perl(CGI)
+# core
BuildRequires: perl(ExtUtils::MakeMaker)
-BuildRequires: perl(HTTP::Daemon)
+# cpan
+BuildRequires: perl(HTTP::Request)
+BuildRequires: perl(HTTP::Response)
+# tests, etc
+BuildRequires: perl(CGI)
BuildRequires: perl(LWP::UserAgent)
-BuildRequires: perl(Scalar::Util)
+BuildRequires: perl(HTTP::Daemon)
BuildRequires: perl(Test::More)
-BuildRequires: perl(Test::Pod)
-
+BuildRequires: perl(Scalar::Util)
-%{?perl_default_filter:
-%filter_from_provides /^perl(JSON::\(Backend::PP\|backportPP::Boolean\|Boolean\|PP\|PP::IncrParser\))/d
-%filter_from_requires /^perl(JSON::backportPP)$/d
-%perl_default_filter}
-%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}perl\\(JSON::(Backend::PP|backportPP::Boolean|Boolean|PP|PP::IncrParser)\\)
-%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(JSON::backportPP\\)
+# not picked up due to eval { requires ... } constructs
+Requires: perl(Scalar::Util)
+Requires: perl(LWP::UserAgent)
+Requires: perl(HTTP::Daemon)
-%{?perl_default_subpackage_tests}
%description
This module converts between JSON (JavaScript Object Notation) and Perl
-data structure into each other. For JSON, see http://www.crockford.com/JSON/.
+data structure into each other. For JSON, See to
+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|#!%{__perl}|' {} +
-sed -i 's/\r//' README t/*
+find . -type f -exec chmod -c -x {} \;
+sed -i 's/\r//' README t/*.t
+
+# Filter unwanted Provides:
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} $* |\
+ sed -e '/perl(My.*)/d' \
+ -e '/perl(_unicode_handling.*)/d' \
+ -e '/perl(JSON::Backend.*/d' \
+ -e '/perl(JSON::Boolean.*)/d' \
+ -e '/perl(JSON::PP::IncrParser.*)/d'
+EOF
+
+%define __perl_provides %{_builddir}/JSON-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
%install
-make pure_install DESTDIR=%{buildroot}
+rm -rf %{buildroot}
-find %{buildroot} -type f -name .packlist -exec rm -f {} +
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
%{_fixperms} %{buildroot}/*
@@ -54,105 +71,18 @@ find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
%check
make test
+%clean
+rm -rf %{buildroot}
+
%files
%defattr(-,root,root,-)
-%doc Changes README
+%doc Changes README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*
%changelog
-* Wed Jul 20 2011 Iain Arnell <iarnell@xxxxxxxxx> 2.53-3
-- update filtering macros for rpm 4.9
-
-* Wed Jul 20 2011 Petr Sabata <contyk@xxxxxxxxxx> - 2.53-2
-- Perl mass rebuild
-
-* Sun May 22 2011 Paul Howarth <paul@xxxxxxxxxxxx> 2.53-1
-- update to 2.53
- - fixed to_json (CPAN RT#68359)
- - backport JSON::PP 2.27200 (fixed incr_parse decoding string more correctly
- - CPAN RT#68032)
- - made Makefile.PL skip an installing XS question when set $ENV{PERL_ONLY} or
- $ENV{NO_XS} (CPAN RT#66820)
-
-* Tue Mar 8 2011 Paul Howarth <paul@xxxxxxxxxxxx> 2.51-1
-- update to 2.51 (#683052)
- - import JSON::PP 2.27105 as BackportPP
- - fix documentation (CPAN RT#64738)
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 2.50-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Jan 27 2011 Paul Howarth <paul@xxxxxxxxxxxx> 2.50-1
-- update to 2.50 (#665621)
- - JSON::PP split off into separate distribution and replaced with
- JSON::backportPP instead for internal use
-- BR: perl(Test::Pod)
-- drop t/ from %%doc as the tests are in the -tests subpackage
-- filter private module perl(JSON::backportPP) from requires
-- filter private module perl(JSON::backportPP::Boolean) from provides
-- filter private module perl(JSON::Backend::PP) from provides
-- filter private module perl(JSON::Boolean) from provides
-- filter private module perl(JSON::PP) from provides (really JSON::backportPP)
-- filter private module perl(JSON::PP::IncrParser) from provides
-
-* Sun Nov 21 2010 Iain Arnell <iarnell@xxxxxxxxx> 2.27-1
-- update to latest upstream version
-- clean up spec for modern rpmbuild
-
-* Sun May 02 2010 Marcela Maslanova <mmaslano@xxxxxxxxxx> - 2.17-2
-- Mass rebuild with perl-5.12.0
-
-* Sun Feb 28 2010 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 2.17-1
-- update by Fedora::App::MaintainerTools 0.004
-- PERL_INSTALL_ROOT => DESTDIR
-- dropped old BR on perl(HTTP::Request)
-- dropped old BR on perl(HTTP::Response)
-- dropped old requires on perl(HTTP::Daemon)
-- dropped old requires on perl(LWP::UserAgent)
-- dropped old requires on perl(Scalar::Util)
-
-* Wed Sep 02 2009 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 2.15-5
-- adjust filtering so we don't drop the versioned perl(JSON:PP) prov
-
-* Tue Sep 01 2009 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 2.15-4
-- bump
-
-* Mon Aug 31 2009 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 2.15-3
-- update filtering
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 2.15-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Jun 22 2009 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 2.15-1
-- auto-update to 2.15 (by cpan-spec-update 0.01)
-
-* Sun Mar 01 2009 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 2.14-1
-- update to 2.14
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 2.12-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 2.12-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sun Oct 12 2008 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 2.12-1
-- update to 2.12
-
-* Wed Jun 25 2008 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 2.11-1
-- update to 2.11
-
-* Wed May 28 2008 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 2.09-1
-- update to 2.09
-
-* Sun Mar 09 2008 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 2.07-1
-- update to 2.x series before F9
-
-* Wed Mar 5 2008 Tom "spot" Callaway <tcallawa@xxxxxxxxxx> 1.15-2
-- rebuild for new perl
-
-* Mon Nov 26 2007 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 1.15-1
-- update to 1.15
+* Sun May 02 2010 Jon Stanley <jonstanley@xxxxxxxxx> - 2.17-1
+- Update to 2.17
* Sun May 13 2007 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 1.14-1
- update to 1.14
diff --git a/sources b/sources
index 11be2b1..3b3c9f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7db1be00d44414c4962eeac222395a76 JSON-2.53.tar.gz
+9a775cc4303a3282b8094cd6a0629397 JSON-2.17.tar.gz
--
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
