diff --git a/JSON-2.51.tar.bz2 b/JSON-2.51.tar.bz2 deleted file mode 100644 index 696acb7..0000000 --- a/JSON-2.51.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0cc638b2c5204d4a6946be8c051cf988764f630da9d47816047fe31d9eaf9b6 -size 57606 diff --git a/JSON-2.51.tar.gz b/JSON-2.51.tar.gz new file mode 100644 index 0000000..ce6ed27 --- /dev/null +++ b/JSON-2.51.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97226d9000c04d47966603ab36531679a9fe12576ca0e6867e109238840cba02 +size 83804 diff --git a/fix_provides.diff b/fix_provides.diff new file mode 100644 index 0000000..40228c5 --- /dev/null +++ b/fix_provides.diff @@ -0,0 +1,14 @@ +Index: JSON-2.51/lib/JSON/backportPP.pm +=================================================================== +--- JSON-2.51/lib/JSON/backportPP.pm 2011-03-08 07:30:52.000000000 +0100 ++++ JSON-2.51/lib/JSON/backportPP.pm 2011-04-05 10:21:44.246841693 +0200 +@@ -1286,7 +1286,8 @@ BEGIN { + } + + if ($] >= 5.008 and $] < 5.008003) { # join() in 5.8.0 - 5.8.2 is broken. +- package JSON::PP; ++ package ++ JSON::PP; + require subs; + subs->import('join'); + eval q| diff --git a/perl-JSON.changes b/perl-JSON.changes index 480d4d7..1aa8598 100644 --- a/perl-JSON.changes +++ b/perl-JSON.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 5 08:17:48 UTC 2011 - coolo@novell.com + +- fix provides - JSON::PP is really another module + ------------------------------------------------------------------- Tue Mar 08 11:45:09 UTC 2011 - pascal.bleser@opensuse.org diff --git a/perl-JSON.spec b/perl-JSON.spec index 1787d3b..68f1cde 100644 --- a/perl-JSON.spec +++ b/perl-JSON.spec @@ -1,7 +1,7 @@ # -# spec file for package perl-JSON +# spec file for package perl-JSON (Version 2.51) # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,38 +15,37 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - -%bcond_with pod - Name: perl-JSON -%define cpan_name JSON -Summary: JSON (JavaScript Object Notation) encoder/decoder Version: 2.51 Release: 1 License: GPL+ or Artistic -Group: Development/Libraries/Perl +%define cpan_name JSON +Summary: JSON (JavaScript Object Notation) encoder/decoder Url: http://search.cpan.org/dist/JSON/ -# http://search.cpan.org/CPAN/authors/id/M/MA/MAKAMAKA/JSON-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.bz2 +Group: Development/Libraries/Perl +#Source: http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-%{version}.tar.gz +Source: %{cpan_name}-%{version}.tar.gz +Patch0: fix_provides.diff BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} BuildRequires: perl BuildRequires: perl-macros -%if %{with pod} -BuildRequires: perl(Test::Pod) >= 1.00 -%endif -BuildRequires: perl(JSON::XS) >= 2.27 -BuildRequires: perl(Test::More) -Recommends: perl(JSON::XS) >= 2.27 +%{perl_requires} %description -JSON (JavaScript Object Notation) is a simple data format. See to -http://www.json.org/ and RFC4627(http://www.ietf.org/rfc/rfc4627.txt). + ************************** CAUTION ******************************** + * This is 'JSON module version 2' and there are many differences * + * to version 1.xx * + * Please check your applications useing old version. * + * See to 'INCOMPATIBLE CHANGES TO OLD VERSION' * + ******************************************************************* -This module converts Perl data structures to JSON and vice versa using either -JSON::XS or JSON::PP. +JSON (JavaScript Object Notation) is a simple data format. See to the +http://www.json.org/ manpage and 'RFC4627'(the +http://www.ietf.org/rfc/rfc4627.txt manpage). + +This module converts Perl data structures to JSON and vice versa using +either the JSON::XS manpage or the JSON::PP manpage. JSON::XS is the fastest and most proper JSON module on CPAN which must be compiled and installed in your environment. JSON::PP is a pure-Perl module @@ -56,12 +55,19 @@ JSON::XS. This module try to use JSON::XS by default and fail to it, use JSON::PP instead. So its features completely depend on JSON::XS or JSON::PP. -Authors: --------- - Makamaka Hannyaharamitu, +See to the BACKEND MODULE DECISION manpage. + +To distinguish the module name 'JSON' and the format type JSON, the former +is quoted by C<> (its results vary with your using media), and the latter +is left just as it is. + +Module name : 'JSON' + +Format type : JSON %prep %setup -q -n %{cpan_name}-%{version} +%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -72,18 +78,14 @@ Authors: %install %perl_make_install -# do not perl_process_packlist (noarch) -# remove .packlist file -%{__rm} -rf $RPM_BUILD_ROOT%perl_vendorarch -# remove perllocal.pod file -%{__rm} -rf $RPM_BUILD_ROOT%perl_archlib +%perl_process_packlist %perl_gen_filelist %clean -%{__rm} -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %files -f %{name}.files -%defattr(-,root,root,-) +%defattr(644,root,root,755) %doc Changes README %changelog