1.1 --- a/json/json.spec Mon Jan 10 20:54:01 2011 +0100
1.2 +++ b/json/json.spec Mon Jan 10 20:55:04 2011 +0100
1.3 @@ -26,10 +26,9 @@
1.4 %define V_api_c2 1.1.0
1.5 %define V_api_c3 0.3
1.6 %define V_api_pl1 2.16
1.7 -%define V_api_pl2 0.03
1.8 -%define V_api_pl3 0.39
1.9 -%define V_api_pl4 2.2311
1.10 -%define V_api_pl5 0.011
1.11 +%define V_api_pl2 0.39
1.12 +%define V_api_pl3 2.26
1.13 +%define V_api_pl4 0.011
1.14 %define V_api_js1 20090929
1.15 %define V_api_js2 20090929
1.16
1.17 @@ -44,20 +43,19 @@
1.18 Group: Language
1.19 License: Open Source
1.20 Version: %{V_api_js2}
1.21 -Release: 20091118
1.22 +Release: 20091120
1.23
1.24 # list of sources
1.25 Source0: http://oss.metaparadigm.com/json-c/json-c-%{V_api_c}.tar.gz
1.26 Source1: http://switch.dl.sourceforge.net/zzjson/zzjson-%{V_api_c2}.tar.gz
1.27 Source2: http://projects.snarc.org/libjson/download/libjson-%{V_api_c3}.tar.bz2
1.28 Source3: http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-%{V_api_pl1}.tar.gz
1.29 -Source4: http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-PC-%{V_api_pl2}.tar.gz
1.30 -Source5: http://www.cpan.org/authors/id/D/DO/DOWENS/JSON-DWIW-%{V_api_pl3}.tar.gz
1.31 -Source6: http://www.cpan.org/authors/id/M/ML/MLEHMANN/JSON-XS-%{V_api_pl4}.tar.gz
1.32 -Source7: http://www.cpan.org/authors/id/P/PE/PERLER/JavaScript-Dumper-%{V_api_pl5}.tar.gz
1.33 -Source8: ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/json-%{V_api_js1}.js
1.34 -Source9: ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/json2-%{V_api_js2}.js
1.35 -Source10: http://www.ietf.org/rfc/rfc4627.txt
1.36 +Source4: http://www.cpan.org/authors/id/D/DO/DOWENS/JSON-DWIW-%{V_api_pl2}.tar.gz
1.37 +Source5: http://www.cpan.org/authors/id/M/ML/MLEHMANN/JSON-XS-%{V_api_pl3}.tar.gz
1.38 +Source6: http://www.cpan.org/authors/id/P/PE/PERLER/JavaScript-Dumper-%{V_api_pl4}.tar.gz
1.39 +Source7: ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/json-%{V_api_js1}.js
1.40 +Source8: ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/json2-%{V_api_js2}.js
1.41 +Source9: http://www.ietf.org/rfc/rfc4627.txt
1.42 Patch0: json.patch
1.43
1.44 # build information
1.45 @@ -100,21 +98,16 @@
1.46 regex = JSON-(__VER__)\.tar\.gz
1.47 }
1.48 prog json:json-pl2 = {
1.49 - version = %{V_api_pl2}
1.50 - url = http://www.cpan.org/authors/id/M/MA/MAKAMAKA/
1.51 - regex = JSON-PC-(__VER__)\.tar\.gz
1.52 - }
1.53 - prog json:json-pl3 = {
1.54 version = %{V_api_pl3}
1.55 url = http://www.cpan.org/authors/id/D/DO/DOWENS/
1.56 regex = JSON-DWIW-(__VER__)\.tar\.gz
1.57 }
1.58 - prog json:json-pl4 = {
1.59 + prog json:json-pl3 = {
1.60 version = %{V_api_pl4}
1.61 url = http://www.cpan.org/authors/id/M/ML/MLEHMANN/
1.62 regex = JSON-XS-(__VER__)\.tar\.gz
1.63 }
1.64 - prog json:json-pl5 = {
1.65 + prog json:json-pl4 = {
1.66 version = %{V_api_pl5}
1.67 url = http://www.cpan.org/authors/id/P/PE/PERLER/
1.68 regex = JavaScript-Dumper-(__VER__)\.tar\.gz
1.69 @@ -138,10 +131,12 @@
1.70 %setup -q -T -D -a 4
1.71 %setup -q -T -D -a 5
1.72 %setup -q -T -D -a 6
1.73 - %setup -q -T -D -a 7
1.74 cp %{SOURCE json-%{V_api_js1}.js} json.js
1.75 cp %{SOURCE json2-%{V_api_js2}.js} json2.js
1.76 %patch -p0
1.77 + %{l_shtool} subst \
1.78 + -e 's;\(AM_CFLAGS *=.*\)-Werror *;\1;' \
1.79 + json-c-%{V_api_c}/Makefile.in
1.80
1.81 %build
1.82 ( cd json-c-%{V_api_c}
1.83 @@ -164,10 +159,9 @@
1.84 ) || exit $?
1.85 %{l_prefix}/bin/perl-openpkg prepare
1.86 %{l_prefix}/bin/perl-openpkg -d JSON-%{V_api_pl1} configure build
1.87 - %{l_prefix}/bin/perl-openpkg -d JSON-PC-%{V_api_pl2} configure build
1.88 - %{l_prefix}/bin/perl-openpkg -d JSON-DWIW-%{V_api_pl3} configure build
1.89 - %{l_prefix}/bin/perl-openpkg -d JSON-XS-%{V_api_pl4} configure build
1.90 - %{l_prefix}/bin/perl-openpkg -d JavaScript-Dumper-%{V_api_pl5} configure build
1.91 + %{l_prefix}/bin/perl-openpkg -d JSON-DWIW-%{V_api_pl2} configure build
1.92 + %{l_prefix}/bin/perl-openpkg -d JSON-XS-%{V_api_pl3} configure build
1.93 + %{l_prefix}/bin/perl-openpkg -d JavaScript-Dumper-%{V_api_pl4} configure build
1.94
1.95 %install
1.96 rm -rf $RPM_BUILD_ROOT
1.97 @@ -205,10 +199,9 @@
1.98 %{l_shtool} install -c -m 644 \
1.99 json.conf $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d/
1.100 %{l_prefix}/bin/perl-openpkg -d JSON-%{V_api_pl1} install
1.101 - %{l_prefix}/bin/perl-openpkg -d JSON-PC-%{V_api_pl2} install
1.102 - %{l_prefix}/bin/perl-openpkg -d JSON-DWIW-%{V_api_pl3} install
1.103 - %{l_prefix}/bin/perl-openpkg -d JSON-XS-%{V_api_pl4} install
1.104 - %{l_prefix}/bin/perl-openpkg -d JavaScript-Dumper-%{V_api_pl5} install
1.105 + %{l_prefix}/bin/perl-openpkg -d JSON-DWIW-%{V_api_pl2} install
1.106 + %{l_prefix}/bin/perl-openpkg -d JSON-XS-%{V_api_pl3} install
1.107 + %{l_prefix}/bin/perl-openpkg -d JavaScript-Dumper-%{V_api_pl4} install
1.108 %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
1.109 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
1.110 %{l_files_std} `cat perl-openpkg-files` \
