rpms/tinyerp/FC-6 .cvsignore, 1.9, 1.10 README.Fedora, 1.1, 1.2 sources, 1.9, 1.10 tinyerp-client.patch, 1.7, 1.8 tinyerp-server.patch, 1.8, 1.9 tinyerp.spec, 1.22, 1.23
Dan Horak (sharkcz)
fedora-extras-commits at redhat.com
Fri Dec 22 19:48:58 UTC 2006
- Previous message (by thread): rpms/pessulus/FC-6 pessulus.spec,1.14,1.15 sources,1.8,1.9
- Next message (by thread): rpms/tinyerp/FC-5 .cvsignore, 1.9, 1.10 README.Fedora, 1.1, 1.2 sources, 1.9, 1.10 tinyerp-client.patch, 1.7, 1.8 tinyerp-server.patch, 1.8, 1.9 tinyerp.spec, 1.21, 1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sharkcz
Update of /cvs/extras/rpms/tinyerp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11419
Modified Files:
.cvsignore README.Fedora sources tinyerp-client.patch
tinyerp-server.patch tinyerp.spec
Log Message:
- update to upstream version 4.0.0
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 13 Oct 2006 19:32:36 -0000 1.9
+++ .cvsignore 22 Dec 2006 19:48:28 -0000 1.10
@@ -1,2 +1,2 @@
-tinyerp-client-3.4.2.tar.gz
-tinyerp-server-3.4.2.tar.gz
+tinyerp-client-4.0.0.tar.gz
+tinyerp-server-4.0.0.tar.gz
Index: README.Fedora
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-6/README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.Fedora 4 Sep 2006 18:35:21 -0000 1.1
+++ README.Fedora 22 Dec 2006 19:48:28 -0000 1.2
@@ -25,3 +25,10 @@
3. start the service again as root:
service tinyerp-server start
+
+
+Post-upgrade steps for Fedora
+=============================
+
+You should be very careful when starting tinyerp-server after an upgrade. Read
+the official docs from /usr/share/doc/tinyerp-server-%{version}/migrate.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 13 Oct 2006 19:32:36 -0000 1.9
+++ sources 22 Dec 2006 19:48:28 -0000 1.10
@@ -1,2 +1,2 @@
-962bb88bc7019d6dc3e8863889524e0f tinyerp-client-3.4.2.tar.gz
-f360588ac94887c6fdf13c448c35fdc1 tinyerp-server-3.4.2.tar.gz
+bed09e8dbcc14134152841ca17338ddd tinyerp-client-4.0.0.tar.gz
+6eb0f0c0b221eab431c507a6d461b4e5 tinyerp-server-4.0.0.tar.gz
tinyerp-client.patch:
Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-6/tinyerp-client.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tinyerp-client.patch 13 Oct 2006 19:32:36 -0000 1.7
+++ tinyerp-client.patch 22 Dec 2006 19:48:28 -0000 1.8
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-client-3.4.2.orig/bin/tinyerp-client.py tinyerp-client-3.4.2/bin/tinyerp-client.py
---- tinyerp-client-3.4.2.orig/bin/tinyerp-client.py 2006-10-06 11:47:27.000000000 +0200
-+++ tinyerp-client-3.4.2/bin/tinyerp-client.py 2006-10-13 14:18:37.000000000 +0200
+diff -Nru tinyerp-client-4.0.0.orig/bin/tinyerp-client.py tinyerp-client-4.0.0/bin/tinyerp-client.py
+--- tinyerp-client-4.0.0.orig/bin/tinyerp-client.py 2006-11-27 13:30:44.000000000 +0100
++++ tinyerp-client-4.0.0/bin/tinyerp-client.py 2006-12-01 17:07:04.000000000 +0100
@@ -73,14 +73,13 @@
import pango
tinyerp-server.patch:
Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-6/tinyerp-server.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tinyerp-server.patch 13 Oct 2006 19:32:36 -0000 1.8
+++ tinyerp-server.patch 22 Dec 2006 19:48:28 -0000 1.9
@@ -1,76 +1,67 @@
-diff -Nru tinyerp-server-3.4.2.orig/setup.py tinyerp-server-3.4.2/setup.py
---- tinyerp-server-3.4.2.orig/setup.py 2006-10-06 11:47:27.000000000 +0200
-+++ tinyerp-server-3.4.2/setup.py 2006-10-13 15:39:00.000000000 +0200
-@@ -28,11 +28,21 @@
+diff -Nru tinyerp-server-4.0.0.orig/bin/netsvc.py tinyerp-server-4.0.0/bin/netsvc.py
+--- tinyerp-server-4.0.0.orig/bin/netsvc.py 2006-11-30 10:20:14.000000000 +0100
++++ tinyerp-server-4.0.0/bin/netsvc.py 2006-12-21 21:05:23.000000000 +0100
+@@ -125,7 +125,6 @@
+ os.makedirs(os.path.dirname(logf))
+ try:
+ fd = open(logf, 'a')
+- print 'OK'
+ handler = logging.StreamHandler(fd)
+ except IOError:
+ print 'H1'
+@@ -259,20 +258,24 @@
+ pass
- 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_evaluation', 'hr_expense', 'hr_timesheet', 'hr_timesheet_ical',
-+ 'hr_timesheet_invoice', 'hr_timesheet_project',
-+ 'letter',
-+ 'marketing', 'mrp',
-+ 'network',
-+ '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',]
+ def handler(self,signum, frame):
++ from tools import config
++ import os
+ self.server.socket.close()
+ self.server.socket.close()
+ Agent.quit()
+-# if tools.config['pidfile']:
+-# os.unlink(tools.config['pidfile'])
++ if config['pidfile']:
++ os.unlink(config['pidfile'])
+ del self.server
+ sys.exit(0)
- 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']),
+ def start(self):
+-# if tools.config['pidfile']:
+-# fd=open(tools.config['pidfile'], 'w')
+-# pidtext="%d" % (os.getpid())
+-# fd.write(pidtext)
+-# fd.close()
++ from tools import config
++ import os
++ if config['pidfile']:
++ fd=open(config['pidfile'], 'w')
++ pidtext="%d" % (os.getpid())
++ fd.write(pidtext)
++ fd.close()
+ signal.signal(signal.SIGINT, self.handler)
+ signal.signal(signal.SIGTERM, self.handler)
+ self.server.register_introspection_functions()
+diff -Nru tinyerp-server-4.0.0.orig/bin/tinyerp-server.py tinyerp-server-4.0.0/bin/tinyerp-server.py
+--- tinyerp-server-4.0.0.orig/bin/tinyerp-server.py 2006-12-05 12:03:10.000000000 +0100
++++ tinyerp-server-4.0.0/bin/tinyerp-server.py 2006-12-21 19:33:42.000000000 +0100
+@@ -136,7 +136,7 @@
+ cr.execute("SELECT relname FROM pg_class WHERE relkind='r' AND relname='perm'")
+ if len(cr.fetchall())==0:
+ #if False:
+- print "init db"
++ logger.notifyChannel("init", netsvc.LOG_INFO, "init db")
+ tools.init_db(cr)
+ # in that case, force --init=all
+ tools.config["init"]["all"] = 1
+diff -Nru tinyerp-server-4.0.0.orig/setup.py tinyerp-server-4.0.0/setup.py
+--- tinyerp-server-4.0.0.orig/setup.py 2006-12-06 09:12:08.000000000 +0100
++++ tinyerp-server-4.0.0/setup.py 2006-12-21 20:45:29.000000000 +0100
+@@ -89,7 +89,7 @@
+ ['man/terp_serverrc.5']),
(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
-
+- (opj('lib','python%s' % py_short_version, 'site-package', 'tinyerp-server', 'i18n'),
++ (opj('lib','python%s' % py_short_version, 'site-packages', 'tinyerp-server', 'i18n'),
+ glob.glob('bin/i18n/*')),
+ (opj('lib', 'python%s' % py_short_version, 'site-packages', 'tinyerp-server', 'addons', 'custom'),
+ glob.glob('bin/addons/custom/*xml') +
Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-6/tinyerp.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- tinyerp.spec 13 Oct 2006 19:32:36 -0000 1.22
+++ tinyerp.spec 22 Dec 2006 19:48:28 -0000 1.23
@@ -20,14 +20,17 @@
Name: tinyerp
-Version: 3.4.2
+Version: 4.0.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}.tar.gz
-Source1: http://tinyerp.org/download/sources/tinyerp-client-%{version}.tar.gz
+# RPM doesn't understand the real URLs, so we use filenames only
+#Source0: http://tinyerp.com/component/option,com_vfm/Itemid,61/do,download/file,stable|source|tinyerp-server-%{version}.tar.gz/
+#Source1: http://tinyerp.com/component/option,com_vfm/Itemid,61/do,download/file,stable|source|tinyerp-client-%{version}.tar.gz/
+Source0: tinyerp-server-%{version}.tar.gz
+Source1: tinyerp-client-%{version}.tar.gz
Source2: tinyerp.desktop
Source3: tinyerp-server.conf
Source4: tinyerp-server
@@ -76,6 +79,8 @@
%patch0
%patch1
+cp %{SOURCE6} tinyerp-server-%{version}/doc/README.Fedora
+
%build
cd tinyerp-client-%{version}
%{_xvfb} :69 -nolisten tcp -ac -terminate &
@@ -101,7 +106,6 @@
%{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
@@ -110,7 +114,6 @@
install -m 644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/tinyerp-server.conf
install -m 755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/tinyerp-server
install -m 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/tinyerp-server
-install -m 644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-server-%{version}/README.Fedora
mkdir -p $RPM_BUILD_ROOT/var/log/tinyerp
mkdir -p $RPM_BUILD_ROOT/var/spool/tinyerp
@@ -130,6 +133,7 @@
%{_datadir}/applications/*.desktop
%files server
+%doc tinyerp-server-%{version}/doc/*
%attr(750,tinyerp,tinyerp) %dir /var/log/tinyerp
%attr(750,tinyerp,tinyerp) %dir /var/spool/tinyerp
%{_sysconfdir}/rc.d/init.d/tinyerp-server
@@ -137,8 +141,8 @@
%config(noreplace) %{_sysconfdir}/logrotate.d/tinyerp-server
%{_bindir}/tinyerp-server
%{python_sitelib}/tinyerp-server/
-%{_defaultdocdir}/%{name}-server-%{version}/
%{_mandir}/man1/tinyerp-server.*
+%{_mandir}/man5/terp_serverrc.*
%pre server
/usr/sbin/fedora-groupadd 13 -r tinyerp &>/dev/null || :
@@ -152,20 +156,23 @@
%preun server
if [ $1 = 0 ] ; then
- service tinyerp-server stop >/dev/null 2>&1
- rm -f /var/log/tinyerp/*
- /sbin/chkconfig --del tinyerp-server
+ service tinyerp-server stop >/dev/null 2>&1
+ rm -f /var/log/tinyerp/*
+ /sbin/chkconfig --del tinyerp-server
fi
%postun server
if [ "$1" -ge "1" ] ; then
- service tinyerp-server condrestart >/dev/null 2>&1
+ service tinyerp-server condrestart >/dev/null 2>&1
fi
test "$1" != 0 || /usr/sbin/fedora-userdel tinyerp &>/dev/null || :
test "$1" != 0 || /usr/sbin/fedora-groupdel tinyerp &>/dev/null || :
%changelog
+* Fri Dec 22 2006 Dan Horak <dan[at]danny.cz> 4.0.0-1
+- update to upstream version 4.0.0
+
* Fri Oct 13 2006 Dan Horak <dan[at]danny.cz> 3.4.2-1
- update to upstream version 3.4.2
- Previous message (by thread): rpms/pessulus/FC-6 pessulus.spec,1.14,1.15 sources,1.8,1.9
- Next message (by thread): rpms/tinyerp/FC-5 .cvsignore, 1.9, 1.10 README.Fedora, 1.1, 1.2 sources, 1.9, 1.10 tinyerp-client.patch, 1.7, 1.8 tinyerp-server.patch, 1.8, 1.9 tinyerp.spec, 1.21, 1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list