OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 15-Nov-2009 21:48:20
Branch: HEAD Handle: 2009111520481900
Modified files:
openpkg-src/json json.spec
Log:
modifying package: json-20090929 20091101 -> 20091115
Summary:
Revision Changes Path
1.136 +29 -9 openpkg-src/json/json.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/json/json.spec
============================================================================
$ cvs diff -u -r1.135 -r1.136 json.spec
--- openpkg-src/json/json.spec 1 Nov 2009 18:15:03 -0000 1.135
+++ openpkg-src/json/json.spec 15 Nov 2009 20:48:19 -0000 1.136
@@ -24,6 +24,7 @@
# package version
%define V_api_c 0.9
%define V_api_c2 1.0.1
+%define V_api_c3 0.2
%define V_api_pl1 2.16
%define V_api_pl2 0.03
%define V_api_pl3 0.39
@@ -43,19 +44,20 @@
Group: Language
License: Open Source
Version: %{V_api_js2}
-Release: 20091101
+Release: 20091115
# 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://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-%{V_api_pl1}.tar.gz
-Source3:
http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-PC-%{V_api_pl2}.tar.gz
-Source4:
http://www.cpan.org/authors/id/D/DO/DOWENS/JSON-DWIW-%{V_api_pl3}.tar.gz
-Source5:
http://www.cpan.org/authors/id/M/ML/MLEHMANN/JSON-XS-%{V_api_pl4}.tar.gz
-Source6:
http://www.cpan.org/authors/id/P/PE/PERLER/JavaScript-Dumper-%{V_api_pl5}.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
+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
# build information
Prefix: %{l_prefix}
@@ -86,6 +88,11 @@
url = http://sourceforge.net/projects/zzjson/files/
regex = zzjson-(__VER__)\.tar\.gz
}
+ prog json:json-c3 = {
+ version = %{V_api_c3}
+ url = http://projects.snarc.org/libjson/download/
+ regex = libjson-(__VER__)\.tar\.bz2
+ }
prog json:json-pl1 = {
version = %{V_api_pl1}
url = http://www.cpan.org/authors/id/M/MA/MAKAMAKA/
@@ -130,6 +137,7 @@
%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
@@ -146,6 +154,12 @@
CC="%{l_cc}" \
%{l_bash} ./buildstatic.sh
) || exit $?
+ ( cd libjson-%{V_api_c3}
+ %{l_make} %{l_mflags} \
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ libjson.a
+ ) || 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
@@ -164,6 +178,12 @@
%{l_shtool} install -c -m 644 \
lib/libzzjson.a $RPM_BUILD_ROOT%{l_prefix}/lib/
) || exit $?
+ ( cd libjson-%{V_api_c3}
+ %{l_shtool} install -c -m 644 \
+ json.h $RPM_BUILD_ROOT%{l_prefix}/include/
+ %{l_shtool} install -c -m 644 \
+ libjson.a $RPM_BUILD_ROOT%{l_prefix}/lib/
+ ) || exit $?
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/share/json
%{l_shtool} install -c -m 644 \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
