rpms/tinyerp/devel tinyerp-server.patch, 1.2, 1.3 tinyerp.spec, 1.12, 1.13

[Dan Horak (sharkcz)]

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3657

Modified Files:
	tinyerp-server.patch tinyerp.spec 
Log Message:
 - add updated server patch


tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-server.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-server.patch	28 Nov 2005 15:01:50 -0000	1.2
+++ tinyerp-server.patch	25 Jan 2006 09:40:10 -0000	1.3
@@ -1,35 +1,28 @@
-diff -Nru tinyerp-server-3.1.1.orig/bin/PKG-INFO tinyerp-server-3.1.1/bin/PKG-INFO
---- tinyerp-server-3.1.1.orig/bin/PKG-INFO	2005-09-12 09:11:17.000000000 +0200
-+++ tinyerp-server-3.1.1/bin/PKG-INFO	2005-11-28 15:30:50.000000000 +0100
-@@ -1,6 +1,6 @@
- Metadata-Version: 1.1
- Name: Tiny ERP
--Version: 2.0.9
-+Version: 3.1.1
- Author: Tiny.be
- Author-email: fp at tiny be
- Maintainer: Tiny.be
-diff -Nru tinyerp-server-3.1.1.orig/setup.py tinyerp-server-3.1.1/setup.py
---- tinyerp-server-3.1.1.orig/setup.py	2005-09-18 16:16:19.000000000 +0200
-+++ tinyerp-server-3.1.1/setup.py	2005-11-28 15:30:50.000000000 +0100
-@@ -21,7 +21,7 @@
- opj = os.path.join
- 
- name = 'tinyerp-server'
--version = '3.0.2'
-+version = '3.1.1'
- 
+diff -Nru tinyerp-server-3.2.0.orig/setup.py tinyerp-server-3.2.0/setup.py
+--- tinyerp-server-3.2.0.orig/setup.py	2006-01-23 19:51:48.000000000 +0100
++++ tinyerp-server-3.2.0/setup.py	2006-01-25 09:24:39.000000000 +0100
+@@ -26,9 +26,11 @@
  # get python short version
  py_short_version = '%s.%s' % sys.version_info[:2]
-@@ -61,9 +61,9 @@
-     '''Build list of data files to be installed'''
-     files = [(opj('share', 'man', 'man1'),
-               ['man/tinyerp-server.1']),
--             (opj('share','doc', 'tinyerp-server'), 
-+             (opj('share','doc', 'tinyerp-server-%s' % version), 
-               [f for f in glob.glob('doc/*') if os.path.isfile(f)]),
--             (opj('share','doc','tinyerp-server', 'i18n'), 
-+             (opj('share','doc','tinyerp-server-%s' % version, 'i18n'), 
-               glob.glob('doc/i18n/*')),
-              (opj('lib', 'python%s' % py_short_version, 'site-packages', 'tinyerp-server', 'addons', 'custom'),
-               glob.glob('bin/addons/custom/*xml') + 
+ 
+-included_addons = ['account', 'base', 'crm', 'custom', 'hr', 'letter',
++included_addons = ['account', 'audittrail', 'base', 'base_partner_relation',
++		   'crm', 'custom', 'delivery', 'edi', 'esale', 'hr', 'letter',
+                    'marketing', 'mrp',
+-                   'network', 'product', 'project', 'purchase', 'sale',
++                   'network', 'product', 'product_electronic', 'product_expiry',
++		   'project', 'purchase', 'sale', 'scrum',
+                    'stock', 'subscription']
+ 
+ required_modules = [('psycopg', 'PostgreSQL module'),
+@@ -104,8 +106,9 @@
+ # create startup script
+ start_script = \
+ "#!/bin/sh\n\
++echo $$ > /var/spool/tinyerp/tinyerp-server.pid\n\
+ cd %s/lib/python%s/site-packages/tinyerp-server\n\
+-exec %s ./tinyerp-server.py $@" % (sys.prefix, py_short_version, sys.executable)
++exec %s ./tinyerp-server.py $@ >> /var/log/tinyerp/tinyerp-server.log 2>&1" % (sys.prefix, py_short_version, sys.executable)
+ # write script
+ f = open('tinyerp-server', 'w')
+ f.write(start_script)


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tinyerp.spec	25 Jan 2006 09:22:50 -0000	1.12
+++ tinyerp.spec	25 Jan 2006 09:40:10 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -136,6 +136,9 @@
 
 
 %changelog
+* Wed Jan 25 2006 Dan Horak <dan at danny.cz> 3.2.0-2
+- add updated server patch
+
 * Wed Jan 25 2006 Dan Horak <dan at danny.cz> 3.2.0-1
 - update to upstream tinyerp 3.2.0
 - fixed status function in the init.d script