Jelajahi Sumber

ops, I accidently committed some not-finished parts related to JSON::Any. Back this out and upgrade the JSON::DWIM stuff

Ralf S. Engelschall 18 tahun lalu
induk
melakukan
c8fbad4e3d
1 mengubah file dengan 3 tambahan dan 13 penghapusan
  1. 3 13
      json/json.spec

+ 3 - 13
json/json.spec

@@ -26,9 +26,8 @@
 %define       V_api_c   0.7
 %define       V_api_pl1 1.14
 %define       V_api_pl2 0.01
-%define       V_api_pl3 0.17
+%define       V_api_pl3 0.19
 %define       V_api_pl4 1.52
-%define       V_api_pl5 1.11
 %define       V_api_js  20070927
 
 #   package information
@@ -50,9 +49,8 @@ Source1:      http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-%{V_api_pl1}.tar
 Source2:      http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-PC-%{V_api_pl2}.tar.gz
 Source3:      http://www.cpan.org/authors/id/D/DO/DOWENS/JSON-DWIW-%{V_api_pl3}.tar.gz
 Source4:      http://www.cpan.org/authors/id/M/ML/MLEHMANN/JSON-XS-%{V_api_pl4}.tar.gz
-Source5:      http://www.cpan.org/authors/id/P/PE/PERIGRIN/JSON-Any-%{V_api_pl5}.tar.gz
-Source6:      ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/json-%{V_api_js}.js
-Source7:      http://www.ietf.org/rfc/rfc4627.txt
+Source5:      ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/json-%{V_api_js}.js
+Source6:      http://www.ietf.org/rfc/rfc4627.txt
 
 #   build information
 Prefix:       %{l_prefix}
@@ -99,11 +97,6 @@ AutoReqProv:  no
         regex     = JSON-XS-(__VER__)\.tar\.gz
         transform = "s/^(\d+\.\d)$/${1}0/; $_"
     }
-    prog json:json-pl5 = {
-        version   = %{V_api_pl5}
-        url       = http://www.cpan.org/authors/id/P/PE/PERIGRIN/
-        regex     = JSON-Any-(__VER__)\.tar\.gz
-    }
     prog json:json-js = {
         version   = %{V_api_js}
         url       = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/
@@ -116,7 +109,6 @@ AutoReqProv:  no
     %setup -q -T -D -a 2
     %setup -q -T -D -a 3
     %setup -q -T -D -a 4
-    %setup -q -T -D -a 5
     cp %{SOURCE json-%{V_api_js}.js} json.js
 
 %build
@@ -133,7 +125,6 @@ AutoReqProv:  no
     %{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 JSON-Any-%{V_api_pl5} configure build
 
 %install
     rm -rf $RPM_BUILD_ROOT
@@ -150,7 +141,6 @@ AutoReqProv:  no
     %{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 JSON-Any-%{V_api_pl5} 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`