rpms/tinyerp/FC-3 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tinyerp-client.patch, 1.4, 1.5 tinyerp-server.patch, 1.6, 1.7 tinyerp.desktop, 1.2, 1.3 tinyerp.spec, 1.12, 1.13 tinyerp-server-pidlog.patch, 1.1, NONE

[Dan Horak (sharkcz)]

Author: sharkcz

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

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server.patch 
	tinyerp.desktop tinyerp.spec 
Removed Files:
	tinyerp-server-pidlog.patch 
Log Message:
 - updated to upstream version 3.3.0
 - updated the client and server patches
 - removed the pidlog patch as it was integrated upstream
 - unified the spec file for FC < 5 and FC >= 5
 - used a new icon in the desktop file



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Jan 2006 13:42:31 -0000	1.6
+++ .cvsignore	19 May 2006 13:30:01 -0000	1.7
@@ -1,2 +1,2 @@
-tinyerp-client-3.2.1.tgz
-tinyerp-server-3.2.1.tgz
+tinyerp-client-3.3.0.tar.gz
+tinyerp-server-3.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Jan 2006 13:42:31 -0000	1.6
+++ sources	19 May 2006 13:30:01 -0000	1.7
@@ -1,2 +1,2 @@
-5e588d39d139f6b66c9f66e59e089d4c  tinyerp-client-3.2.1.tgz
-4acbbd8e8fac798ea3e9da08e076b465  tinyerp-server-3.2.1.tgz
+93364c3aae7c64dd71ced12133a16574  tinyerp-client-3.3.0.tar.gz
+ece14c707f91f2b5b4b46906899e6d9d  tinyerp-server-3.3.0.tar.gz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-client.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tinyerp-client.patch	30 Jan 2006 13:42:31 -0000	1.4
+++ tinyerp-client.patch	19 May 2006 13:30:01 -0000	1.5
@@ -1,6 +1,6 @@
-diff -Nru client.orig/bin/tinyerp-client.py client/bin/tinyerp-client.py
---- client.orig/bin/tinyerp-client.py	2006-01-27 11:50:28.000000000 +0100
-+++ client/bin/tinyerp-client.py	2006-01-30 14:22:52.000000000 +0100
+diff -Nru tinyerp-client-3.3.0.orig/bin/tinyerp-client.py tinyerp-client-3.3.0/bin/tinyerp-client.py
+--- tinyerp-client-3.3.0.orig/bin/tinyerp-client.py	2006-05-18 18:06:39.000000000 +0200
++++ tinyerp-client-3.3.0/bin/tinyerp-client.py	2006-05-19 13:15:25.000000000 +0200
 @@ -73,14 +73,13 @@
  import pango
  
@@ -20,15 +20,3 @@
  
  import options
  
-diff -Nru client.orig/setup.py client/setup.py
---- client.orig/setup.py	2006-01-23 10:43:47.000000000 +0100
-+++ client/setup.py	2006-01-30 14:22:58.000000000 +0100
-@@ -18,7 +18,7 @@
- opj = os.path.join
- 
- name = 'tinyerp-client'
--version = '3.2.0'
-+version = '3.2.1'
- 
- # get python short version
- py_short_version = '%s.%s' % sys.version_info[:2]

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tinyerp-server.patch	18 Mar 2006 14:39:57 -0000	1.6
+++ tinyerp-server.patch	19 May 2006 13:30:01 -0000	1.7
@@ -1,23 +1,27 @@
-diff -Nru server.orig/setup.py server/setup.py
---- server.orig/setup.py	2006-01-23 10:43:47.000000000 +0100
-+++ server/setup.py	2006-01-30 14:23:25.000000000 +0100
-@@ -21,14 +21,16 @@
- opj = os.path.join
+diff -Nru tinyerp-server-3.3.0.orig/setup.py tinyerp-server-3.3.0/setup.py
+--- tinyerp-server-3.3.0.orig/setup.py	2006-05-19 10:56:54.000000000 +0200
++++ tinyerp-server-3.3.0/setup.py	2006-05-19 13:21:04.000000000 +0200
+@@ -28,11 +28,18 @@
  
- name = 'tinyerp-server'
--version = '3.2.0'
-+version = '3.2.1'
- 
- # get python short version
- py_short_version = '%s.%s' % sys.version_info[:2]
- 
--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']
+ included_addons = [
+     'account', 'account_followup', 'airport', 'audittrail',
+-    'base','base_partner_relation', 'crm', 'custom', 'delivery', 'edi', 'esale',
+-    'hr', 'hr_timesheet', 'marketing', 'mrp', 'network', 'oscommerce',
+-    'product','product_electronic', 'product_expiry', 'product_extended',
+- 	'productivity_analysis', 'project', 'purchase', 'sale', 'sandwich', 'scrum',
+-    'stock', 'subscription', 'travel',
++    'base','base_partner_relation',
++    'crm', 'custom',
++    'delivery',
++    'edi', 'esale',
++    'hr', 'hr_timesheet', 'hr_timesheet_project',
++    'letter',
++    'marketing', 'mrp',
++    'network',
++    'oscommerce',
++    'product','product_electronic', 'product_expiry', 'product_extended', 'productivity_analysis', 'project', 'purchase',
++    'sale', 'sandwich', 'scrum', 'stock', 'subscription',
++    'travel',
+     'l10n_be', 'l10n_ca-qc', 'l10n_ch', 'l10n_fr', 'l10n_se', 'l10n_simple',]
  
  required_modules = [('psycopg', 'PostgreSQL module'),


Index: tinyerp.desktop
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp.desktop	27 Nov 2005 09:26:58 -0000	1.2
+++ tinyerp.desktop	19 May 2006 13:30:01 -0000	1.3
@@ -4,7 +4,7 @@
 GenericName=ERP Client
 Comment=Access TinyERP server
 Exec=tinyerp-client
-Icon=/usr/share/pixmaps/tinyerp-client/tinyerp.png
+Icon=/usr/share/pixmaps/tinyerp-client/tinyerp_icon.png
 StartupNotify=true
 Terminal=false
 Type=Application


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tinyerp.spec	18 Mar 2006 14:39:57 -0000	1.12
+++ tinyerp.spec	19 May 2006 13:30:01 -0000	1.13
@@ -1,15 +1,33 @@
+#### options:
+# Use --with/--without modular_X to rebuild with/without modular X deps
+
+#### default options:
+%if 0%{?fedora}
+%if 0%{?fedora} < 5
+# default to non-modular X on FC < 5
+%define _modular_X 0%{?_with_modular_x:1}
+%else
+# default to modular X on FC >= 5
+%define _modular_X 0%{!?_without_modular_x:1}
+%endif
+%else
+# default to modular X elsewhere
+%define _modular_X 0%{!?_without_modular_x:1}
+%endif
+
 %{?!pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+
 Name:		tinyerp
-Version:	3.2.1
-Release:	2%{?dist}
+Version:	3.3.0
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
 URL:		http://tinyerp.org
-Source0:	http://tinyerp.org/download/sources/tinyerp-server-%{version}.tgz
-Source1:	http://tinyerp.org/download/sources/tinyerp-client-%{version}.tgz
+Source0:	http://tinyerp.org/download/sources/tinyerp-server-%{version}.tar.gz
+Source1:	http://tinyerp.org/download/sources/tinyerp-client-%{version}.tar.gz
 Source2:	tinyerp.desktop
 Source3:	tinyerp-server.conf
 Source4:	tinyerp-server
@@ -18,11 +36,17 @@
 BuildArch:	noarch
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
 BuildRequires:	python-psycopg, libxslt-python, pydot
-BuildRequires:	desktop-file-utils, xorg-x11-Xvfb
+BuildRequires:	desktop-file-utils
+%if %_modular_X
+BuildRequires:	xorg-x11-server-Xvfb, xorg-x11-fonts-base
+%define _xvfb /usr/bin/Xvfb
+%else
+BuildRequires:	xorg-x11-Xvfb
+%define _xvfb /usr/X11R6/bin/Xvfb
+%endif
 Requires:	pygtk2, pygtk2-libglade, pydot
 Patch0:		tinyerp-client.patch
 Patch1:		tinyerp-server.patch
-Patch2:		tinyerp-server-pidlog.patch
 
 %description
 Tiny ERP is a free enterprise management software package. It 
@@ -50,23 +74,20 @@
 %setup -q -a 1 -c %{name}-%{version}
 %patch0
 %patch1
-%patch2
 
 %build
-cd client
-# fix filename for the czech translation
-mv bin/po/cz.po bin/po/cs.po
-/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
+cd tinyerp-client-%{version}
+%{_xvfb} :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py build
-cd ../server
+cd ../tinyerp-server-%{version}
 DISPLAY=:69 ./setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd client
-/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
+cd tinyerp-client-%{version}
+%{_xvfb} :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
-cd ../server
+cd ../tinyerp-server-%{version}
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
 cd ..
 %find_lang tinyerp-client
@@ -79,7 +100,7 @@
 	%{SOURCE2}
 
 cd $RPM_BUILD_ROOT%{python_sitelib}/tinyerp-client
-for i in tinyerp.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do
+for i in tinyerp.png tinyerp_icon.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do
 	ln -s ../../../../share/pixmaps/tinyerp-client/$i $i
 done
 
@@ -139,20 +160,35 @@
 
 
 %changelog
-* Sat Mar 18 2006 Dan Horak <dan at danny.cz> 3.2.1-2
+* Fri May 19 2006 Dan Horak <dan at danny.cz> 3.3.0-1
+- update to upstream tinyerp 3.3.0
+- the pidlog patch was integrated into upstream
+- unified the specfile for FC < 5 and FC >=5
+- used new icon in the desktop file
+
+* Sat Mar 18 2006 Dan Horak <dan at danny.cz> 3.2.1-3
 - new config file with only default values (#184505)
 - added a patch for handling the pid and log file in the server (#184502)
 
+* Tue Feb 14 2006 Dan Horak <dan at danny.cz> 3.2.1-2
+- rebuild for Fedora Extras 5
+
 * Mon Jan 30 2006 Dan Horak <dan at danny.cz> 3.2.1-1
 - update to upstream tinyerp 3.2.1
 - fixed filename for the czech translation
 
+* 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
 - 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
+
 * 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


--- tinyerp-server-pidlog.patch DELETED ---