From a83a3b5cd481f7f69a5f66d2ca667494878d8453 Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Sat, 5 May 2007 20:23:14 +0000 Subject: [PATCH] - update to 1.12 - add t/ to %%doc --- .cvsignore | 2 +- perl-JSON.spec | 29 ++++++++++++++++++++++------- sources | 2 +- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5688558..bb1a264 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -JSON-1.11.tar.gz +JSON-1.12.tar.gz diff --git a/perl-JSON.spec b/perl-JSON.spec index 78840fb..34a9a32 100644 --- a/perl-JSON.spec +++ b/perl-JSON.spec @@ -1,6 +1,6 @@ Name: perl-JSON -Version: 1.11 -Release: 2%{?dist} +Version: 1.12 +Release: 1%{?dist} Summary: Parse and convert to JSON (JavaScript Object Notation) License: GPL or Artistic Group: Development/Libraries @@ -8,7 +8,11 @@ URL: http://search.cpan.org/dist/JSON/ 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)) + +# core BuildRequires: perl(ExtUtils::MakeMaker) +# cpan BuildRequires: perl(HTTP::Request) BuildRequires: perl(HTTP::Response) @@ -24,7 +28,6 @@ Requires: perl(Scalar::Util) Requires: perl(LWP::UserAgent) Requires: perl(HTTP::Daemon) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module converts between JSON (JavaScript Object Notation) and Perl @@ -34,11 +37,19 @@ http://www.crockford.com/JSON/. %prep %setup -q -n JSON-%{version} -# remove errant exec bits... +# make rpmlint happy... find . -type f -exec chmod -c -x {} \; +sed -i 's/\r//' README t/*.t -# fix some EOL encodings -sed -i 's/\r//' README +# Filter unwanted Provides: +cat << \EOF > %{name}-prov +#!/bin/sh +%{__perl_provides} $* |\ + sed -e '/perl(My.*)/d' +EOF + +%define __perl_provides %{_builddir}/JSON-%{version}/%{name}-prov +chmod +x %{__perl_provides} %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -62,11 +73,15 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc Changes README +%doc Changes README t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri May 04 2007 Chris Weyl 1.12-1 +- update to 1.12 +- add t/ to %%doc + * Wed Apr 25 2007 Chris Weyl 1.11-2 - bump diff --git a/sources b/sources index 6f57ac3..1f0b2f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c1e50efa98c9f7c1907b0dfd6b2656a9 JSON-1.11.tar.gz +6bce8b1ff5b242deea5228b1a3c4e6e7 JSON-1.12.tar.gz