rpms/tinyerp/FC-5 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tinyerp-client.patch, 1.5, 1.6 tinyerp-server.patch, 1.6, 1.7 tinyerp.spec, 1.19, 1.20

Dan Horak (sharkcz) fedora-extras-commits at redhat.com
Wed Sep 27 15:19:36 UTC 2006 

Author: sharkcz

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

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server.patch 
	tinyerp.spec 
Log Message:
- removed workaround for font path problems on devel
- update to upstream version 3.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 May 2006 13:27:30 -0000	1.7
+++ .cvsignore	27 Sep 2006 15:19:35 -0000	1.8
@@ -1,2 +1,2 @@
-tinyerp-client-3.3.0.tar.gz
-tinyerp-server-3.3.0.tar.gz
+tinyerp-client-3.4.1.tar.gz
+tinyerp-server-3.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 May 2006 13:27:30 -0000	1.7
+++ sources	27 Sep 2006 15:19:35 -0000	1.8
@@ -1,2 +1,2 @@
-93364c3aae7c64dd71ced12133a16574  tinyerp-client-3.3.0.tar.gz
-ece14c707f91f2b5b4b46906899e6d9d  tinyerp-server-3.3.0.tar.gz
+dc81fc8d1e73f16570fd2ab42445f2f7  tinyerp-client-3.4.1.tar.gz
+7d4233217a6c34efa42e0afaa5a10d34  tinyerp-server-3.4.1.tar.gz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp-client.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tinyerp-client.patch	19 May 2006 13:27:30 -0000	1.5
+++ tinyerp-client.patch	27 Sep 2006 15:19:35 -0000	1.6
@@ -1,6 +1,6 @@
-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
+diff -Nru tinyerp-client-3.4.1.orig/bin/tinyerp-client.py tinyerp-client-3.4.1/bin/tinyerp-client.py
+--- tinyerp-client-3.4.1.orig/bin/tinyerp-client.py	2006-09-12 15:00:39.000000000 +0200
++++ tinyerp-client-3.4.1/bin/tinyerp-client.py	2006-09-13 15:58:36.000000000 +0200
 @@ -73,14 +73,13 @@
  import pango
  

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp-server.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tinyerp-server.patch	19 May 2006 13:27:30 -0000	1.6
+++ tinyerp-server.patch	27 Sep 2006 15:19:35 -0000	1.7
@@ -1,27 +1,76 @@
-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 @@
+diff -Nru tinyerp-server-3.4.1.orig/setup.py tinyerp-server-3.4.1/setup.py
+--- tinyerp-server-3.4.1.orig/setup.py	2006-09-12 15:00:39.000000000 +0200
++++ tinyerp-server-3.4.1/setup.py	2006-09-26 22:20:45.000000000 +0200
+@@ -28,11 +28,21 @@
  
  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',
+-    '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',
++    'hr', 'hr_evaluation', 'hr_expense', 'hr_timesheet', 'hr_timesheet_ical',
++    'hr_timesheet_invoice', 'hr_timesheet_project',
 +    'letter',
 +    'marketing', 'mrp',
 +    'network',
-+    'oscommerce',
-+    'product','product_electronic', 'product_expiry', 'product_extended', 'productivity_analysis', 'project', 'purchase',
-+    'sale', 'sandwich', 'scrum', 'stock', 'subscription',
++    'partner_ldap', 'product','product_electronic', 'product_expiry',
++    'product_extended', 'product_variant', 'productivity_analysis', 'project',
++    'purchase',
++    'report_crm', 'report_project', 'report_purchase', 'report_sale',
++    'sale', 'sale_crm', 'sale_rebate', 'sandwich', 'scrum', 'stock', 'subscription',
 +    'travel',
      'l10n_be', 'l10n_ca-qc', 'l10n_ch', 'l10n_fr', 'l10n_se', 'l10n_simple',]
  
  required_modules = [('psycopg', 'PostgreSQL module'),
+@@ -56,9 +66,8 @@
+     for addon in included_addons:
+         path = opj('bin', 'addons', addon)
+         for dirpath, dirnames, filenames in os.walk(path):
+-            if '__init__.py' in filenames:
+-                modname = dirpath.replace(os.path.sep, '.')
+-                yield modname.replace('bin', 'tinyerp-server', 1)
++            modname = dirpath.replace(os.path.sep, '.')
++            yield modname.replace('bin', 'tinyerp-server', 1)
+ 
+ def data_files():
+     '''Build list of data files to be installed'''
+@@ -66,12 +75,8 @@
+               ['man/tinyerp-server.1']),
+              (opj('share','doc', 'tinyerp-server-%s' % version), 
+               [f for f in glob.glob('doc/*') if os.path.isfile(f)]),
+-             (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') + 
+-              glob.glob('bin/addons/custom/*rml') +
+-              glob.glob('bin/addons/custom/*xsl'))]
++             (opj('share','doc','tinyerp-server-%s' % version, 'migrate/3.3.0-3.4.0'), 
++              glob.glob('doc/migrate/3.3.0-3.4.0/*'))]
+     for addon in find_addons():
+         add_path = addon.replace('.', os.path.sep).replace('tinyerp-server', 'bin',
+                                                            1)
+@@ -79,15 +84,9 @@
+                           add_path.replace('bin', 'tinyerp-server', 1)),
+                       glob.glob(opj(add_path, '*xml')) +
+                       glob.glob(opj(add_path, '*csv')) +
+-                      glob.glob(opj(add_path, '*sql'))),
+-                     (opj('lib', 'python%s' % py_short_version, 'site-packages',
+-                          add_path.replace('bin', 'tinyerp-server', 1), 'data'),
+-                      glob.glob(opj(add_path, 'data', '*xml'))), 
+-                     (opj('lib', 'python%s' % py_short_version, 'site-packages',
+-                          add_path.replace('bin', 'tinyerp-server', 1), 'report'),
+-                      glob.glob(opj(add_path, 'report', '*xml')) +
+-                      glob.glob(opj(add_path, 'report', '*rml')) +
+-                      glob.glob(opj(add_path, 'report', '*xsl')))]
++                      glob.glob(opj(add_path, '*sql')) +
++                      glob.glob(opj(add_path, '*rml')) +
++                      glob.glob(opj(add_path, '*xsl')))]
+         files.extend(pathfiles)
+     return files
+ 


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tinyerp.spec	5 Sep 2006 17:09:27 -0000	1.19
+++ tinyerp.spec	27 Sep 2006 15:19:35 -0000	1.20
@@ -20,8 +20,8 @@
 
 
 Name:		tinyerp
-Version:	3.3.0
-Release:	3%{?dist}
+Version:	3.4.1
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -93,14 +93,16 @@
 cd ..
 %find_lang tinyerp-client
 
-mv $RPM_BUILD_ROOT/%{_datadir}/tinyerp-client/* $RPM_BUILD_ROOT/%{python_sitelib}/tinyerp-client
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/tinyerp-client
+mv $RPM_BUILD_ROOT%{_datadir}/tinyerp-client/* $RPM_BUILD_ROOT%{python_sitelib}/tinyerp-client
+cp -a tinyerp-client-%{version}/bin/themes $RPM_BUILD_ROOT%{_datadir}/tinyerp-client
 
 desktop-file-install --vendor fedora				\
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications		\
 	%{SOURCE2}
 
 cd $RPM_BUILD_ROOT%{python_sitelib}/tinyerp-client
+
+ln -s ../../../../share/tinyerp-client/themes themes
 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
@@ -123,6 +125,7 @@
 %{python_sitelib}/tinyerp-client/
 %{_defaultdocdir}/%{name}-client-%{version}/
 %{_mandir}/man1/tinyerp-client.*
+%{_datadir}/tinyerp-client/
 %{_datadir}/pixmaps/tinyerp-client/
 %{_datadir}/applications/*.desktop
 
@@ -163,6 +166,13 @@
 
 
 %changelog
+* Wed Sep 27 2006 Dan Horak <dan[at]danny.cz> 3.4.1-1
+- removed workaround for font path problems on devel
+- update to upstream version 3.4.1
+
+* Wed Sep 13 2006 Dan Horak <dan[at]danny.cz> 3.3.0-4
+- added a workaround for font path problems on devel
+
 * Mon Sep  4 2006 Dan Horak <dan[at]danny.cz> 3.3.0-3
 - rebuild for FC-6
 - added README with post-install steps

More information about the scm-commits mailing list