[Erp5-report] r12475 - /spec/mandriva/2007.0/openoffice.org-oood/

[nobody at svn.erp5.org]

Author: kevin
Date: Wed Jan 31 11:24:52 2007
New Revision: 12475

URL: http://svn.erp5.org?rev=12475&view=rev
Log:
Python XMLRPC patch is still required...

Added:
    spec/mandriva/2007.0/openoffice.org-oood/SimpleXMLRPCServer.patch
Modified:
    spec/mandriva/2007.0/openoffice.org-oood/openoffice.org-oood.spec

Added: spec/mandriva/2007.0/openoffice.org-oood/SimpleXMLRPCServer.patch
URL: http://svn.erp5.org/spec/mandriva/2007.0/openoffice.org-oood/SimpleXMLRPCServer.patch?rev=12475&view=auto
==============================================================================
--- spec/mandriva/2007.0/openoffice.org-oood/SimpleXMLRPCServer.patch (added)
+++ spec/mandriva/2007.0/openoffice.org-oood/SimpleXMLRPCServer.patch Wed Jan 31 11:24:52 2007
@@ -1,0 +1,52 @@
+*** /usr/local/lib/python2.3/SimpleXMLRPCServer.py	Fri Nov  7 14:30:16 2003
+--- SimpleXMLRPCServer.py	Mon Feb  9 11:43:45 2004
+***************
+*** 153,159 ****
+      """
+  
+!     def __init__(self):
+          self.funcs = {}
+          self.instance = None
+  
+      def register_instance(self, instance):
+--- 153,160 ----
+      """
+  
+!     def __init__(self, allow_none):
+          self.funcs = {}
+          self.instance = None
++         self.allow_none = allow_none
+  
+      def register_instance(self, instance):
+***************
+*** 231,235 ****
+              # wrap response in a singleton tuple
+              response = (response,)
+!             response = xmlrpclib.dumps(response, methodresponse=1)
+          except Fault, fault:
+              response = xmlrpclib.dumps(fault)
+--- 232,236 ----
+              # wrap response in a singleton tuple
+              response = (response,)
+!             response = xmlrpclib.dumps(response, methodresponse=1, allow_none = self.allow_none)
+          except Fault, fault:
+              response = xmlrpclib.dumps(fault)
+***************
+*** 444,451 ****
+  
+      def __init__(self, addr, requestHandler=SimpleXMLRPCRequestHandler,
+!                  logRequests=1):
+          self.logRequests = logRequests
+  
+!         SimpleXMLRPCDispatcher.__init__(self)
+          SocketServer.TCPServer.__init__(self, addr, requestHandler)
+  
+--- 445,452 ----
+  
+      def __init__(self, addr, requestHandler=SimpleXMLRPCRequestHandler,
+!                  logRequests=1, allow_none = 0):
+          self.logRequests = logRequests
+  
+!         SimpleXMLRPCDispatcher.__init__(self, allow_none)
+          SocketServer.TCPServer.__init__(self, addr, requestHandler)
+  

Modified: spec/mandriva/2007.0/openoffice.org-oood/openoffice.org-oood.spec
URL: http://svn.erp5.org/spec/mandriva/2007.0/openoffice.org-oood/openoffice.org-oood.spec?rev=12475&r1=12474&r2=12475&view=diff
==============================================================================
--- spec/mandriva/2007.0/openoffice.org-oood/openoffice.org-oood.spec (original)
+++ spec/mandriva/2007.0/openoffice.org-oood/openoffice.org-oood.spec Wed Jan 31 11:24:52 2007
@@ -2,7 +2,7 @@
 %define deamon_name  oood
 
 %define version      0.2.0
-%define release      5
+%define release      6
 
 %define server_user   oood
 %define config_dir    %{_sysconfdir}/oood
@@ -19,6 +19,7 @@
 Group:         System/Servers
 Source0:       %{deamon_name}-%{version}.tar.bz2
 Patch1:        openoffice.org-2.0.3-skip-registration.patch
+Patch2:        SimpleXMLRPCServer.patch
 URL:           http://svn.erp5.org/erp5/trunk/utils/ooodoc_server/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 Requires:      python >= 2.4, openoffice.org-pyuno >= 2.0.0, xorg-x11-Xvfb
@@ -62,6 +63,7 @@
 # Create and populate /var/lib/oood/patches/
 %{__mkdir_p} %{buildroot}/%{server_dir}/patches
 %{__cp} -a  %{PATCH1}  %{buildroot}/%{server_dir}/patches/
+%{__cp} -a  %{PATCH2}  %{buildroot}/%{server_dir}/patches/
 
 # Create and populate /var/run/oood
 %{__mkdir_p} %{buildroot}%{run_dir}
@@ -122,6 +124,14 @@
 OOO_ROOT=`echo $OOO_ROOT | python -c "print raw_input().replace('/', '\/')"`
 %{__sed} -i "s/\/opt\/openoffice.org2.0/`echo $OOO_ROOT`/g" %{config_dir}/config.py
 
+# Hack / Patch 2
+# This patch python XML-RPC server. This patch was commited upstream in official
+#   python project, so this patch should be deleted for Mandriva 2008.
+%define patches_dir %{server_dir}/patches
+%{__cp} -a %{py_libdir}/SimpleXMLRPCServer.py %{py_libdir}/SimpleXMLRPCServer.py.rpmsave
+%{__patch} %{py_libdir}/SimpleXMLRPCServer.py --input=%{patches_dir}/SimpleXMLRPCServer.patch
+
+
 # Add service and start server
 %_post_service oood
 %__service oood restart
@@ -135,6 +145,9 @@
 OOO_ROOT_2=`grep 'uno_path' %{config_dir}/config.py | python -c "print '/'.join(raw_input().split(\"'\")[1].split(\"/\")[:-1])"`
 %define ooo_file_to_unpatch $OOO_ROOT_2/%{ooo_setup_file}
 %{__mv} %{ooo_file_to_unpatch}.rpmsave %{ooo_file_to_unpatch}
+
+# Unpatche XML-RPC server   
+%{__mv} %{py_libdir}/SimpleXMLRPCServer.py.rpmsave %{py_libdir}/SimpleXMLRPCServer.py
 
 
 %postun
@@ -160,8 +173,11 @@
 
 #----------------------------------------------------------------------
 %changelog
+* Wed Jan 31 2007 Kevin Deldycke <kevin at nexedi.com> 0.2.0-6mdv2007.0
+- XMLRPC python patch is still required (it was merge upstrem in python 2.5 not 2.4)
+
 * Fri Jan 26 2007 Kevin Deldycke <kevin at nexedi.com> 0.2.0-5mdv2007.0
-- patch is required
+- 'patch' command is required
 
 * Fri Jan 26 2007 Kevin Deldycke <kevin at nexedi.com> 0.2.0-4mdv2007.0
 - Fix missing macro