rpms/tinyerp/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tinyerp-client.patch, 1.2, 1.3 tinyerp-server, 1.2, 1.3 tinyerp-server.patch, 1.3, 1.4 tinyerp.spec, 1.11, 1.12

Dan Horak (sharkcz) fedora-extras-commits at redhat.com
Wed Jan 25 08:40:28 UTC 2006 

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1023

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server 
	tinyerp-server.patch tinyerp.spec 
Log Message:
 - update to upstream tinyerp 3.2.0
 - fixed status function in the init.d script
 - fixed using localization for the client
 - include all distributed addons



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Nov 2005 14:43:00 -0000	1.4
+++ .cvsignore	25 Jan 2006 08:40:27 -0000	1.5
@@ -1,2 +1,2 @@
-tinyerp-client-3.1.1.tar.gz
-tinyerp-server-3.1.1.tar.gz
+tinyerp-client-3.2.0.tar.gz
+tinyerp-server-3.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Nov 2005 14:43:00 -0000	1.4
+++ sources	25 Jan 2006 08:40:27 -0000	1.5
@@ -1,2 +1,2 @@
-c2c36a43704b470190e771b478f3f771  tinyerp-client-3.1.1.tar.gz
-eceb59222b7df18ac157ca50a20e8c67  tinyerp-server-3.1.1.tar.gz
+e99d5d27b9f2bc3171f255448c7626b9  tinyerp-client-3.2.0.tar.gz
+6371dfe2d3220320cc8b183be7bb2d38  tinyerp-server-3.2.0.tar.gz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-client.patch	28 Nov 2005 14:43:00 -0000	1.2
+++ tinyerp-client.patch	25 Jan 2006 08:40:27 -0000	1.3
@@ -1,21 +1,22 @@
-diff -Nru tinyerp-client-3.1.1.orig/setup.py tinyerp-client-3.1.1/setup.py
---- tinyerp-client-3.1.1.orig/setup.py	2005-09-18 16:19:18.000000000 +0200
-+++ tinyerp-client-3.1.1/setup.py	2005-11-28 15:30:40.000000000 +0100
-@@ -18,7 +18,7 @@
- opj = os.path.join
+diff -Nru tinyerp-client-3.2.0.orig/bin/tinyerp-client.py tinyerp-client-3.2.0/bin/tinyerp-client.py
+--- tinyerp-client-3.2.0.orig/bin/tinyerp-client.py	2006-01-23 19:51:49.000000000 +0100
++++ tinyerp-client-3.2.0/bin/tinyerp-client.py	2006-01-25 09:12:57.000000000 +0100
+@@ -73,14 +73,13 @@
+ import pango
  
- name = 'tinyerp-client'
--version = '3.0.2'
-+version = '3.1.1'
+ # end testing
+-APP = 'terp'
+-DIR = 'po'
++APP = 'tinyerp-client'
  
- # get python short version
- py_short_version = '%s.%s' % sys.version_info[:2]
-@@ -49,7 +49,7 @@
-               ['bin/terp.glade', 'bin/tipoftheday.txt'])]
-     return files
+ locale.setlocale(locale.LC_ALL, '')
+-gettext.bindtextdomain(APP, DIR)
++gettext.bindtextdomain(APP)
+ gettext.textdomain(APP)
+-gettext.install(APP, DIR, unicode=1)
+-gtk.glade.bindtextdomain(APP, DIR)
++gettext.install(APP, unicode=1)
++gtk.glade.bindtextdomain(APP)
  
--included_plugins = ['auction_lots_html', 'huissier', 'slideshow', 'workflow_print']
-+included_plugins = ['workflow_print']
+ import options
  
- def find_plugins():
-     for plugin in included_plugins:


Index: tinyerp-server
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-server	18 Dec 2005 20:12:51 -0000	1.2
+++ tinyerp-server	25 Jan 2006 08:40:27 -0000	1.3
@@ -27,24 +27,25 @@
 [ -z "/usr/bin/tinyerp-server" ] && exit 0
 
 RETVAL=0
+PIDFILE=/var/spool/tinyerp/tinyerp-server.pid
+LOCKFILE=/var/lock/subsys/tinyerp-server
 
 start() {
     echo -n $"Starting $prog: "
     daemon --user tinyerp --check tinyerp-server "/usr/bin/setsid /usr/bin/tinyerp-server $OPTS &"
 
     RETVAL=$?
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/tinyerp-server
+    [ $RETVAL -eq 0 ] && touch $LOCKFILE
     echo
     return $RETVAL
 }
 
 stop() {
     echo -n  $"Stopping $prog: "
-    kill -TERM `cat /var/spool/tinyerp/tinyerp-server.pid` > /dev/null 2>&1
+    kill -TERM `cat $PIDFILE` > /dev/null 2>&1
     RETVAL=$?
     if [ $RETVAL -eq 0 ] ; then
-    	rm -f /var/lock/subsys/tinyerp-server
-    	rm -f /var/spool/tinyerp/tinyerp-server.pid
+    	rm -f $PIDFILE $LOCKFILE
 
 	echo_success
 	echo 
@@ -61,11 +62,22 @@
 }    
 
 condrestart() {
-    [ -e /var/lock/subsys/tinyerp-server ] && restart || :
+    [ -e $LOCKFILE ] && restart || :
 }
 
 rhstatus() { 
-    status tinyerp-server
+    if [ -f $PIDFILE ] ; then
+        checkpid `cat $PIDFILE`
+	RETVAL=$?
+        if [ $RETVAL -eq 0 ] ; then
+	    echo  $"$prog is running..."
+	else
+	    echo  $"$prog is stopped"
+	fi
+    else
+    	echo  $"$prog is stopped"
+    fi
+    return $RETVAL
 }
 
 case "$1" in

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tinyerp-server.patch	18 Dec 2005 20:14:37 -0000	1.3
+++ tinyerp-server.patch	25 Jan 2006 08:40:27 -0000	1.4
@@ -1,39 +1,21 @@
-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-12-18 20:51:56.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') + 
-@@ -104,8 +104,9 @@
+ 
+-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\


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tinyerp.spec	18 Dec 2005 20:12:51 -0000	1.11
+++ tinyerp.spec	25 Jan 2006 08:40:27 -0000	1.12
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
-Version:	3.1.1
-Release:	5%{?dist}
+Version:	3.2.0
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -38,6 +38,7 @@
 Requires:	libxslt-python, python-imaging
 Requires:	python-psycopg, python-reportlab
 Requires:	graphviz, pyparsing, postgresql-server
+Requires:	ghostscript
 Requires(pre):	fedora-usermgmt
 Requires(postun):	fedora-usermgmt
 
@@ -100,9 +101,9 @@
 %files server
 %attr(750,tinyerp,tinyerp) %dir /var/log/tinyerp
 %attr(750,tinyerp,tinyerp) %dir /var/spool/tinyerp
-%config(noreplace) %{_sysconfdir}/tinyerp-server.conf
 %{_sysconfdir}/rc.d/init.d/tinyerp-server
-%{_sysconfdir}/logrotate.d/tinyerp-server
+%config(noreplace) %{_sysconfdir}/tinyerp-server.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/tinyerp-server
 %{_bindir}/tinyerp-server
 %{python_sitelib}/tinyerp-server/   
 %{_defaultdocdir}/%{name}-server-%{version}/
@@ -134,6 +135,12 @@
 
 
 %changelog
+* 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
+- fixed using localization for the client
+- include all distributed addons
+
 * Sun Dec 18 2005 Dan Horak <dan at danny.cz> 3.1.1-5
 - added Requires(postun) to the -server package (Ville Skyttä)
 - improved startup script, suggested by Enrico Scholz

More information about the fedora-extras-commits mailing list