fix tracking

json/json.spec

@@ -28,6 +28,7 @@
 %define       V_api_pl2 0.01
 %define       V_api_pl3 0.17
 %define       V_api_pl4 1.52
+%define       V_api_pl5 1.11
 %define       V_api_js  20070927
 
 #   package information
@@ -41,7 +42,7 @@ Class:        PLUS
 Group:        Language
 License:      Open Source
 Version:      %{V_api_js}
-Release:      20071018
+Release:      20071019
 
 #   list of sources
 Source0:      http://oss.metaparadigm.com/json-c/json-c-%{V_api_c}.tar.gz
@@ -49,8 +50,9 @@ 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:      ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/json-%{V_api_js}.js
-Source6:      http://www.ietf.org/rfc/rfc4627.txt
+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
 
 #   build information
 Prefix:       %{l_prefix}
@@ -92,11 +94,16 @@ AutoReqProv:  no
         regex     = JSON-DWIW-(__VER__)\.tar\.gz
     }
     prog json:json-pl4 = {
-        version   = %{V_api_pl4}0
+        version   = %{V_api_pl4}
         url       = http://www.cpan.org/authors/id/M/ML/MLEHMANN/
         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/
@@ -109,6 +116,7 @@ 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
@@ -125,6 +133,7 @@ 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
@@ -141,6 +150,7 @@ 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`

openvpn21/openvpn21.spec

@@ -37,7 +37,7 @@ Class:        EVAL
 Group:        Network
 License:      GPL
 Version:      %{V_opkg}
-Release:      20071017
+Release:      20071019
 
 #   package options
 %option       with_fsl  yes
@@ -74,7 +74,7 @@ Conflicts:    openvpn
     prog openvpn21 = {
         version   = %{V_dist}
         url       = http://openvpn.net/release/
-        regex     = openvpn-(\d+\.\d+(\.\d+)*)\.tar\.gz
+        regex     = openvpn-(2\.1(?:\.\d+|_rc\d+))\.tar\.gz
     }
 
 %prep