From 92d357751eedf7571d112263b2dbcbc484f1bde5 Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Mon, 10 Mar 2008 03:19:50 +0000 Subject: [PATCH] - update to 2.x series before F9 --- .cvsignore | 2 +- perl-JSON.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index cc91d41..9288a69 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -JSON-1.15.tar.gz +JSON-2.07.tar.gz diff --git a/perl-JSON.spec b/perl-JSON.spec index cff4f31..53341b7 100644 --- a/perl-JSON.spec +++ b/perl-JSON.spec @@ -1,6 +1,6 @@ Name: perl-JSON -Version: 1.15 -Release: 2%{?dist} +Version: 2.07 +Release: 1%{?dist} Summary: Parse and convert to JSON (JavaScript Object Notation) License: GPL+ or Artistic Group: Development/Libraries @@ -37,14 +37,15 @@ http://www.crockford.com/JSON/. %setup -q -n JSON-%{version} # make rpmlint happy... -find . -type f -exec chmod -c -x {} \; -sed -i 's/\r//' README t/*.t +find . -type f -exec chmod -c -x {} + +find t/ -type f -exec perl -pi -e 's|^#! perl|#!/usr/bin/perl|' {} + +sed -i 's/\r//' README t/* # Filter unwanted Provides: cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ - sed -e '/perl(My.*)/d' + sed -e '/perl(My.*)/d; /perl(_unicode_handling)/d' EOF %define __perl_provides %{_builddir}/JSON-%{version}/%{name}-prov @@ -59,7 +60,7 @@ rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} \; +find %{buildroot} -type f -name .packlist -exec rm -f {} + find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* @@ -77,6 +78,9 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Sun Mar 09 2008 Chris Weyl 2.07-1 +- update to 2.x series before F9 + * Wed Mar 5 2008 Tom "spot" Callaway 1.15-2 - rebuild for new perl diff --git a/sources b/sources index fac5e6f..1a20a5c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f96dd0b68b644bc07453afc29105b7c JSON-1.15.tar.gz +1ca7b2851f1a8e835eec46d013da8a2b JSON-2.07.tar.gz