[Erp5-report] r11075 - /spec/mandriva/2006.0/OOoDocument_server/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Nov 2 18:07:05 CET 2006
Author: kevin
Date: Thu Nov 2 18:07:04 2006
New Revision: 11075
URL: http://svn.erp5.org?rev=11075&view=rev
Log:
Update to version 0.1.1.
Use %mkrel and others generic macro.
Added:
spec/mandriva/2006.0/OOoDocument_server/SimpleXMLRPCServer.patch
Modified:
spec/mandriva/2006.0/OOoDocument_server/OOoDocument_server.spec
Modified: spec/mandriva/2006.0/OOoDocument_server/OOoDocument_server.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/OOoDocument_server/OOoDocument_server.spec?rev=11075&r1=11074&r2=11075&view=diff
==============================================================================
--- spec/mandriva/2006.0/OOoDocument_server/OOoDocument_server.spec (original)
+++ spec/mandriva/2006.0/OOoDocument_server/OOoDocument_server.spec Thu Nov 2 18:07:04 2006
@@ -1,79 +1,89 @@
-Summary: OOoDocument conversion server
-Name: OOoDocument_server
-Version:0.1
-Release: 4mdk
-Source: ooodocument_server.tgz
-License:GPL
-Group:System/Base
-Requires: python >= 2.4
-Requires: openoffice.org-pyuno = 2.0.3
-Vendor: Mandriva
-Distribution: Mandriva Linux
-Packager: Bartlomiej Gorny <nobody at mandriva.org>
-URL: http://nexedi.com
+%define product OOoDocument_server
+%define version 0.1.1
+%define release 1
+
+%define server_user ooodoc
+%define config_dir %{_sysconfdir}/ooodoc
+%define server_dir %{_var}/lib/ooodoc_server
+
+Summary: Standalone server for converting various types of docs to/from OpenOffice format, extracting and editing metadata.
+Name: %{product}
+Version: %{version}
+Release: %mkrel %{release}
+License: GPL
+Group: System/Servers
+Source0: %{product}-%{version}.tgz
+Patch1: 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.3
+BuildRequires: python >= 2.4
+
+#----------------------------------------------------------------------
+%description
+A server for converting docs from other formats to OOo, generating pdf files, keeping unchangeable snapshots in pdf format, getting and setting metadata. To be used together with ERP5 Document business template, although can be run standalone for any other client application.
+
+It returns a file in a desired format; html files are zipped because they often consist of more than one file.
+
+#----------------------------------------------------------------------
%prep
-echo "preparatory stage"
+%setup -c
+
+
+%build
+
+
+%install
+%{__rm} -rf %{buildroot}
+
+%{__mkdir_p} %{buildroot}/%{config_dir}
+%{__mv} %{product}/config.py %{buildroot}/%{config_dir}/
+%{__mv} %{product}/runserw.sh %{buildroot}/%{config_dir}/
+%{__mv} %{product}/start.sh %{buildroot}/%{config_dir}/
+%py_compile %{buildroot}/%{config_dir}
+
+%{__mkdir_p} %{buildroot}/%{server_dir}/tmp
+%{__cp} -a %{product}/* %{buildroot}/%{server_dir}/
+%{__cp} -a %{PATCH1} %{buildroot}/%{server_dir}/
+%py_compile %{buildroot}/%{server_dir}
+
+cat %{product}/README > README.urpmi
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
%pre
-echo "in preinstall"
-useradd ooodoc
+%_pre_useradd %{server_user} %{server_dir} /bin/false
+# Hack: Silent patch
+%{__cp} -a %{py_libdir}/SimpleXMLRPCServer.py %{py_libdir}/SimpleXMLRPCServer.py.rpmsave
+%{__patch} %{py_libdir}/SimpleXMLRPCServer.py --input=%{server_dir}/%{PATCH1}
-%install
-echo "installing"
-
-%post
-chown ooodoc:ooodoc /var/lib/ooodoc_server
-filetopatch="/usr/lib/python2.4/SimpleXMLRPCServer.py"
-echo ""
-echo "patching $filetopatch..."
-echo ""
-echo "if it says something about reversed patch, say no"
-echo ""
-patch -b $filetopatch /var/lib/ooodoc_server/SimpleXMLRPCServer.diff
-echo ""
%postun
-userdel ooodoc
-rm -rf /etc/ooodoc
-rm -rf /var/lib/ooodoc_server/doc
-rm -rf /var/lib/ooodoc_server
-echo "see you"
+%_postun_userdel %{server_user}
+# Restore patched file
+%{__mv} %{py_libdir}/SimpleXMLRPCServer.py.rpmsave %{py_libdir}/SimpleXMLRPCServer.py
+
%files
-%defattr(-,root,root)
-%doc /var/lib/ooodoc_server/README
-/etc/ooodoc/config.py
-/etc/ooodoc/runserw.sh
-/etc/ooodoc/start.sh
-/var/lib/ooodoc_server/runserw.py
-/var/lib/ooodoc_server/start.py
-/var/lib/ooodoc_server/cli.py
-/var/lib/ooodoc_server/factory.py
-/var/lib/ooodoc_server/lib.py
-/var/lib/ooodoc_server/mimemapper.py
-/var/lib/ooodoc_server/pool.py
-/var/lib/ooodoc_server/serw.py
-/var/lib/ooodoc_server/test_server.py
-/var/lib/ooodoc_server/test_worker.py
-/var/lib/ooodoc_server/worker.py
-/var/lib/ooodoc_server/SimpleXMLRPCServer.diff
-/var/lib/ooodoc_server/doc/test.doc
-/var/lib/ooodoc_server/doc/test.xls
-/var/lib/ooodoc_server/doc/test.odt
-/var/lib/ooodoc_server/doc/test.odp
-/var/lib/ooodoc_server/doc/test.html
-/var/lib/ooodoc_server/doc/test.pdf
+%defattr(0644,root,root,755)
+%doc %{product}/VERSION.txt %{product}/README %{product}/MAINTAINERS.txt README.urpmi
+%config(noreplace) %{config_dir}/*
+%{server_dir}/*
+%attr(-,%{server_user},%{server_user}) %{server_dir}/*
-%description
-A standalone server for converting various types of docs to/from OpenOffice
- format, extracting and editing metadata.
-
+#----------------------------------------------------------------------
%changelog
+* Thu Nov 02 2006 Kevin Deldycke <kevin at nexedi.com> 0.1.1-1mdk
+- Update to version 0.1.1
+- Use %mkrel and others generic macro
* Tue Jul 18 2006 Bartlomiej Gorny <bartek at redpoint.mn.pl> 0.1-3mdk
- Second build
+- Second build
* Fri Jun 30 2006 Bartlomiej Górny <bartek at redpoint.mn.pl> 0.1-2mdk
- first build
+- first build
Added: spec/mandriva/2006.0/OOoDocument_server/SimpleXMLRPCServer.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/OOoDocument_server/SimpleXMLRPCServer.patch?rev=11075&view=auto
==============================================================================
--- spec/mandriva/2006.0/OOoDocument_server/SimpleXMLRPCServer.patch (added)
+++ spec/mandriva/2006.0/OOoDocument_server/SimpleXMLRPCServer.patch Thu Nov 2 18:07:04 2006
@@ -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)
+
More information about the Erp5-report
mailing list