[perl-JSON-RPC/f17] Merge and split

[Emmanuel Seyman]

commit 5aeafe5a97f498e3ab9ac835c5a65ec5d43032d6
Author: Emmanuel Seyman <emmanuel.seyman(a)club-internet.fr&gt;
Date:   Sun Jul 1 15:55:24 2012 +0200

    Merge and split

 .gitignore         |    1 +
 perl-JSON-RPC.spec |   68 +++++++++++++++++++++++++++++++++++++--------------
 sources            |    2 +-
 3 files changed, 51 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 14447be..76ef94f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 JSON-RPC-0.96.tar.gz
 /JSON-RPC-1.01.tar.gz
+/JSON-RPC-1.03.tar.gz
diff --git a/perl-JSON-RPC.spec b/perl-JSON-RPC.spec
index efba960..a2e02af 100644
--- a/perl-JSON-RPC.spec
+++ b/perl-JSON-RPC.spec
@@ -1,6 +1,6 @@
 Name:           perl-JSON-RPC
-Version:        1.01
-Release:        2%{?dist}
+Version:        1.03
+Release:        1%{?dist}
 Summary:        Perl implementation of JSON-RPC 1.1 protocol
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -21,6 +21,8 @@ BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Router::Simple)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo
$version))
+Obsoletes:      perl-JSON-RPC-legacy < 1.0.3
+Provides:       perl-JSON-RPC-legacy = %{version}
 
 %{?perl_default_filter}
 
@@ -30,25 +32,41 @@ protocol for inter-networking applications over HTTP. It uses JSON as
the
 data format for of all facets of a remote procedure call, including all
 application data carried in parameters.
 
-%package legacy-server
-Summary: The legacy server part of JSON::RPC
+%package Apache2
+Summary:   JSON-RPC server for mod_perl2
+Obsoletes: perl-JSON-RPC-legacy-server < 1.0.3
+Provides:  perl-JSON-RPC-legacy-server = %{version}
 
-%package legacy
-Summary: The legacy client part of JSON::RPC
+%package CGI
+Summary:   JSON-RPC server for CGI scripts
+Obsoletes: perl-JSON-RPC-legacy-server < 1.0.3
+Provides:  perl-JSON-RPC-legacy-server = %{version}
 
-%description legacy-server
+%package Daemon
+Summary:   JSON-RPC standalone daemon
+Obsoletes: perl-JSON-RPC-legacy-server < 1.0.3
+Provides:  perl-JSON-RPC-legacy-server = %{version}
+
+%description Apache2
+JSON-RPC is a stateless and light-weight remote procedure call (RPC)
+protocol for inter-networking applications over HTTP. It uses JSON as the
+data format for of all facets of a remote procedure call, including all
+application data carried in parameters. This is the mod_perl2 server
+implementation.
+
+%description CGI
 JSON-RPC is a stateless and light-weight remote procedure call (RPC)
 protocol for inter-networking applications over HTTP. It uses JSON as the
 data format for of all facets of a remote procedure call, including all
-application data carried in parameters. This is the legacy server-side
-implementation, which exposes the 0.xx version of the API.
+application data carried in parameters. This is the CGI server
+implementation.
 
-%description legacy
+%description Daemon
 JSON-RPC is a stateless and light-weight remote procedure call (RPC)
 protocol for inter-networking applications over HTTP. It uses JSON as the
 data format for of all facets of a remote procedure call, including all
-application data carried in parameters. This is the legacy client-side
-implementation, which allows the use of the 0.xx version of the API.
+application data carried in parameters. This is the standalone daemon
+to serve JSON-RPC requests.
 
 %prep
 %setup -q -n JSON-RPC-%{version}
@@ -69,24 +87,36 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 make test
 
 %files
-%doc Changes README
+%doc Changes
 %{perl_vendorlib}/JSON/RPC.pm
 %{perl_vendorlib}/JSON/RPC/Constants.pm
 %{perl_vendorlib}/JSON/RPC/Dispatch.pm
+%{perl_vendorlib}/JSON/RPC/Legacy.pm
+%{perl_vendorlib}/JSON/RPC/Legacy/Client.pm
+%{perl_vendorlib}/JSON/RPC/Legacy/Procedure.pm
 %{perl_vendorlib}/JSON/RPC/Parser.pm
 %{perl_vendorlib}/JSON/RPC/Procedure.pm
+%{perl_vendorlib}/JSON/RPC/Test.pm
 %{_mandir}/man3/*
 
-%files legacy
-%{perl_vendorlib}/JSON/RPC/Legacy.pm
-%{perl_vendorlib}/JSON/RPC/Legacy/Client.pm
-%{perl_vendorlib}/JSON/RPC/Legacy/Procedure.pm
+%files Apache2
+%{perl_vendorlib}/JSON/RPC/Legacy/Server.pm
+%{perl_vendorlib}/JSON/RPC/Legacy/Server/Apache2.pm
 
-%files legacy-server
-%{perl_vendorlib}/JSON/RPC/Legacy/Server
+%files CGI
 %{perl_vendorlib}/JSON/RPC/Legacy/Server.pm
+%{perl_vendorlib}/JSON/RPC/Legacy/Server/CGI.pm
+
+%files Daemon
+%{perl_vendorlib}/JSON/RPC/Legacy/Server.pm
+%{perl_vendorlib}/JSON/RPC/Legacy/Server/Daemon.pm
 
 %changelog
+* Sun Jul 01 2012 Emmanuel Seyman <emmanuel.seyman(a)club-internet.fr&gt; - 1.03-1
+- Update to 1.03
+- Merge back the legacy implementation in the main package
+- Split the different server implementations in their own packages
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; -
1.01-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 5f21252..d25baae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-802d5bb488f3587f16aa69e8c002132b  JSON-RPC-1.01.tar.gz
+a978df8ace00cdd286317087bdcd92b0  JSON-RPC-1.03.tar.gz