# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1294689304 -3600
# Node ID fbf6cb91be092a94fb21300246815e70ff3d7a97
# Parent  2bd9bf3f6f034f61cb572df07cffe98bb6c8c179
Blind commit of previously modified packaging logic.

diff -r 2bd9bf3f6f03 -r fbf6cb91be09 json/json.spec
--- a/json/json.spec	Mon Jan 10 20:54:01 2011 +0100
+++ b/json/json.spec	Mon Jan 10 20:55:04 2011 +0100
@@ -26,10 +26,9 @@
 %define       V_api_c2  1.1.0
 %define       V_api_c3  0.3
 %define       V_api_pl1 2.16
-%define       V_api_pl2 0.03
-%define       V_api_pl3 0.39
-%define       V_api_pl4 2.2311
-%define       V_api_pl5 0.011
+%define       V_api_pl2 0.39
+%define       V_api_pl3 2.26
+%define       V_api_pl4 0.011
 %define       V_api_js1 20090929
 %define       V_api_js2 20090929
 
@@ -44,20 +43,19 @@
 Group:        Language
 License:      Open Source
 Version:      %{V_api_js2}
-Release:      20091118
+Release:      20091120
 
 #   list of sources
 Source0:      http://oss.metaparadigm.com/json-c/json-c-%{V_api_c}.tar.gz
 Source1:      http://switch.dl.sourceforge.net/zzjson/zzjson-%{V_api_c2}.tar.gz
 Source2:      http://projects.snarc.org/libjson/download/libjson-%{V_api_c3}.tar.bz2
 Source3:      http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-%{V_api_pl1}.tar.gz
-Source4:      http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-PC-%{V_api_pl2}.tar.gz
-Source5:      http://www.cpan.org/authors/id/D/DO/DOWENS/JSON-DWIW-%{V_api_pl3}.tar.gz
-Source6:      http://www.cpan.org/authors/id/M/ML/MLEHMANN/JSON-XS-%{V_api_pl4}.tar.gz
-Source7:      http://www.cpan.org/authors/id/P/PE/PERLER/JavaScript-Dumper-%{V_api_pl5}.tar.gz
-Source8:      ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/json-%{V_api_js1}.js
-Source9:      ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/json2-%{V_api_js2}.js
-Source10:     http://www.ietf.org/rfc/rfc4627.txt
+Source4:      http://www.cpan.org/authors/id/D/DO/DOWENS/JSON-DWIW-%{V_api_pl2}.tar.gz
+Source5:      http://www.cpan.org/authors/id/M/ML/MLEHMANN/JSON-XS-%{V_api_pl3}.tar.gz
+Source6:      http://www.cpan.org/authors/id/P/PE/PERLER/JavaScript-Dumper-%{V_api_pl4}.tar.gz
+Source7:      ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/json-%{V_api_js1}.js
+Source8:      ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/json2-%{V_api_js2}.js
+Source9:      http://www.ietf.org/rfc/rfc4627.txt
 Patch0:       json.patch
 
 #   build information
@@ -100,21 +98,16 @@
         regex     = JSON-(__VER__)\.tar\.gz
     }
     prog json:json-pl2 = {
-        version   = %{V_api_pl2}
-        url       = http://www.cpan.org/authors/id/M/MA/MAKAMAKA/
-        regex     = JSON-PC-(__VER__)\.tar\.gz
-    }
-    prog json:json-pl3 = {
         version   = %{V_api_pl3}
         url       = http://www.cpan.org/authors/id/D/DO/DOWENS/
         regex     = JSON-DWIW-(__VER__)\.tar\.gz
     }
-    prog json:json-pl4 = {
+    prog json:json-pl3 = {
         version   = %{V_api_pl4}
         url       = http://www.cpan.org/authors/id/M/ML/MLEHMANN/
         regex     = JSON-XS-(__VER__)\.tar\.gz
     }
-    prog json:json-pl5 = {
+    prog json:json-pl4 = {
         version   = %{V_api_pl5}
         url       = http://www.cpan.org/authors/id/P/PE/PERLER/
         regex     = JavaScript-Dumper-(__VER__)\.tar\.gz
@@ -138,10 +131,12 @@
     %setup -q -T -D -a 4
     %setup -q -T -D -a 5
     %setup -q -T -D -a 6
-    %setup -q -T -D -a 7
     cp %{SOURCE json-%{V_api_js1}.js} json.js
     cp %{SOURCE json2-%{V_api_js2}.js} json2.js
     %patch -p0
+    %{l_shtool} subst \
+        -e 's;\(AM_CFLAGS *=.*\)-Werror *;\1;' \
+        json-c-%{V_api_c}/Makefile.in
 
 %build
     ( cd json-c-%{V_api_c}
@@ -164,10 +159,9 @@
     ) || exit $?
     %{l_prefix}/bin/perl-openpkg prepare
     %{l_prefix}/bin/perl-openpkg -d JSON-%{V_api_pl1} configure build
-    %{l_prefix}/bin/perl-openpkg -d JSON-PC-%{V_api_pl2} configure build
-    %{l_prefix}/bin/perl-openpkg -d JSON-DWIW-%{V_api_pl3} configure build
-    %{l_prefix}/bin/perl-openpkg -d JSON-XS-%{V_api_pl4} configure build
-    %{l_prefix}/bin/perl-openpkg -d JavaScript-Dumper-%{V_api_pl5} configure build
+    %{l_prefix}/bin/perl-openpkg -d JSON-DWIW-%{V_api_pl2} configure build
+    %{l_prefix}/bin/perl-openpkg -d JSON-XS-%{V_api_pl3} configure build
+    %{l_prefix}/bin/perl-openpkg -d JavaScript-Dumper-%{V_api_pl4} configure build
 
 %install
     rm -rf $RPM_BUILD_ROOT
@@ -205,10 +199,9 @@
     %{l_shtool} install -c -m 644 \
         json.conf $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d/
     %{l_prefix}/bin/perl-openpkg -d JSON-%{V_api_pl1} install
-    %{l_prefix}/bin/perl-openpkg -d JSON-PC-%{V_api_pl2} install
-    %{l_prefix}/bin/perl-openpkg -d JSON-DWIW-%{V_api_pl3} install
-    %{l_prefix}/bin/perl-openpkg -d JSON-XS-%{V_api_pl4} install
-    %{l_prefix}/bin/perl-openpkg -d JavaScript-Dumper-%{V_api_pl5} install
+    %{l_prefix}/bin/perl-openpkg -d JSON-DWIW-%{V_api_pl2} install
+    %{l_prefix}/bin/perl-openpkg -d JSON-XS-%{V_api_pl3} install
+    %{l_prefix}/bin/perl-openpkg -d JavaScript-Dumper-%{V_api_pl4} install
     %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} `cat perl-openpkg-files` \