rpms/tinyerp/devel tinyerp-client.patch, 1.2, 1.3 tinyerp-server, 1.1, 1.2 tinyerp.spec, 1.11, 1.12

[Dan Horak (sharkcz)]

Author: sharkcz

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

Modified Files:
	tinyerp-client.patch tinyerp-server 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


tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-client.patch	28 Nov 2005 15:01:50 -0000	1.2
+++ tinyerp-client.patch	25 Jan 2006 09:22:50 -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/devel/tinyerp-server,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp-server	20 Nov 2005 18:25:32 -0000	1.1
+++ tinyerp-server	25 Jan 2006 09:22:50 -0000	1.2
@@ -27,40 +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() {
-    # create temporary startup script to get pid of the server process
-    cat > /tmp/tinyerp-server.run << EOF
-/usr/bin/tinyerp-server $OPTS >> /var/log/tinyerp/tinyerp-server.log 2>&1 &
-echo \$! > /tmp/tinyerp-server.pid
-EOF
-    chmod 0755 /tmp/tinyerp-server.run
-    
     echo -n $"Starting $prog: "
-    su -l tinyerp -c "/tmp/tinyerp-server.run"
+    daemon --user tinyerp --check tinyerp-server "/usr/bin/setsid /usr/bin/tinyerp-server $OPTS &"
+
     RETVAL=$?
-    
-    if [ $RETVAL -eq 0 ]; then
-        mv /tmp/tinyerp-server.pid /var/run
-	
-        touch /var/lock/subsys/tinyerp-server
-        echo_success
-        echo
-    else
-	echo_failure
-	echo
-    fi
-    rm -f /tmp/tinyerp-server.run
+    [ $RETVAL -eq 0 ] && touch $LOCKFILE
+    echo
     return $RETVAL
 }
 
 stop() {
     echo -n  $"Stopping $prog: "
-    kill -TERM `cat /var/run/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/run/tinyerp-server.pid
+    	rm -f $PIDFILE $LOCKFILE
 
 	echo_success
 	echo 
@@ -77,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


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tinyerp.spec	4 Jan 2006 11:19:48 -0000	1.11
+++ tinyerp.spec	25 Jan 2006 09:22:50 -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:	6%{?dist}
+Version:	3.2.0
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -19,7 +19,7 @@
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
 BuildRequires:	python-psycopg, libxslt-python, pydot
 BuildRequires:	desktop-file-utils
-BuildRequires:	xorg-x11-server-Xvfb, xorg-x11-fonts-base, xorg-x11-fonts-misc
+BuildRequires:	xorg-x11-server-Xvfb, xorg-x11-fonts-base
 Requires:	pygtk2, pygtk2-libglade, pydot
 Patch0:		tinyerp-client.patch
 Patch1:		tinyerp-server.patch
@@ -136,6 +136,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
+
 * Wed Jan  4 2006 Dan Horak <dan at danny.cz> 3.1.1-6
 - added new Xorg dependencies