rpms/perl-Catalyst-View-JSON/F-7 perl-Catalyst-View-JSON-allow-xs.patch, NONE, 1.1 perl-Catalyst-View-JSON.spec, 1.1, 1.2

[Simon Wilkinson (sxw)]

Author: sxw

Update of /cvs/extras/rpms/perl-Catalyst-View-JSON/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10228

Modified Files:
	perl-Catalyst-View-JSON.spec 
Added Files:
	perl-Catalyst-View-JSON-allow-xs.patch 
Log Message:
Don't force JSON::Any to use JSON module - permits building on F-8 and older

perl-Catalyst-View-JSON-allow-xs.patch:

--- NEW FILE perl-Catalyst-View-JSON-allow-xs.patch ---
--- Catalyst-View-JSON-0.24/lib/Catalyst/View/JSON.pm	2008-03-03 01:44:14.000000000 -0800
+++ Catalyst-View-JSON-0.24.new/lib/Catalyst/View/JSON.pm	2008-04-03 16:46:06.641343970 -0700
@@ -23,8 +23,8 @@
         }
     }
 
-    my $driver = $arguments->{json_driver} || 'JSON';
-    $driver =~ s/^JSON:://; #backward compatibility
+    my $driver = $arguments->{json_driver};
+    $driver =~ s/^JSON::// if $driver; #backward compatibility
 
     if (my $method = $self->can('encode_json')) {
         $self->json_dumper( sub {
@@ -34,7 +34,7 @@
     } else {
         eval {
             require JSON::Any;
-            JSON::Any->import($driver);
+            JSON::Any->import($driver) if $driver;
             my $json = JSON::Any->new; # create the copy of JSON handler
             $self->json_dumper(sub { $json->objToJson($_[0]) });
         };


Index: perl-Catalyst-View-JSON.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-View-JSON/F-7/perl-Catalyst-View-JSON.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Catalyst-View-JSON.spec	12 Apr 2008 21:20:53 -0000	1.1
+++ perl-Catalyst-View-JSON.spec	12 Apr 2008 22:17:28 -0000	1.2
@@ -1,18 +1,19 @@
 Name:           perl-Catalyst-View-JSON
 Version:        0.24
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        JSON view for your data
 License:        GPL+ or Artistic 2.0
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-View-JSON/
 Source0:        http://www.cpan.org/authors/id/M/MI/MIYAGAWA/Catalyst-View-JSON-%{version}.tar.gz
+Patch0:		perl-Catalyst-View-JSON-allow-xs.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Catalyst) >= 5.6
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(JSON::Any) >= 1.15
 BuildRequires:  perl(Test::Builder::Module)
-BuildRequires:  perl(JSON)
+BuildRequires:  perl(JSON::XS)
 Requires:       perl(Catalyst) >= 5.6
 Requires:       perl(JSON::Any) >= 1.15
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -24,6 +25,8 @@
 %prep
 %setup -q -n Catalyst-View-JSON-%{version}
 
+%patch0 -p1
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -51,5 +54,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 12 2008 Simon Wilkinson <simon at sxw.org.uk> 0.24-2
+- Allow the JSON::Any package to pick any JSON module, to let us work on F8
+  Patch from Chris Weyl (Bugzilla #439157)
+
 * Thu Mar 27 2008 Simon Wilkinson <simon at sxw.org.uk> 0.24-1
 - Specfile autogenerated by cpanspec 1.73.