rpms/tinyerp/devel tinyerp-2.1.3-client-correctver.patch, NONE, 1.1 tinyerp-2.1.3-client-flag.patch, NONE, 1.1 tinyerp-2.1.3-client-syspath.patch, NONE, 1.1 tinyerp-2.1.3-server-py24.patch, NONE, 1.1 tinyerp-2.1.3-server-syspath.patch, NONE, 1.1 tinyerp.desktop, NONE, 1.1 tinyerp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Thu Aug 18 19:31:25 UTC 2005
Author: spot
Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22162/devel
Modified Files:
.cvsignore sources
Added Files:
tinyerp-2.1.3-client-correctver.patch
tinyerp-2.1.3-client-flag.patch
tinyerp-2.1.3-client-syspath.patch
tinyerp-2.1.3-server-py24.patch
tinyerp-2.1.3-server-syspath.patch tinyerp.desktop
tinyerp.spec
Log Message:
auto-import tinyerp-2.1.3-6 on branch devel from tinyerp-2.1.3-6.src.rpm
tinyerp-2.1.3-client-correctver.patch:
--- NEW FILE tinyerp-2.1.3-client-correctver.patch ---
--- tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py.BAD 2005-08-01 13:23:18.000000000 -0500
+++ tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py 2005-08-01 13:23:23.000000000 -0500
@@ -18,7 +18,7 @@
opj = os.path.join
name = 'tinyerp-client'
-version = '2.1.2'
+version = '2.1.3'
required_modules = [('gtk', 'gtk python bindings'),
('gtk.glade', 'glade python bindings')]
tinyerp-2.1.3-client-flag.patch:
--- NEW FILE tinyerp-2.1.3-client-flag.patch ---
--- tinyerp-2.1.3/tinyerp-client-2.1.3/bin/tinyerp-client.BAD 2005-08-03 12:03:57.000000000 -0500
+++ tinyerp-2.1.3/tinyerp-client-2.1.3/bin/tinyerp-client 2005-08-03 12:04:13.000000000 -0500
@@ -101,7 +101,7 @@
try:
pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.join(os.path.dirname(__file__),'flag.png'))
except:
- pixbuf = gtk.gdk.pixbuf_new_from_file('flag.png')
+ pixbuf = gtk.gdk.pixbuf_new_from_file('/usr/share/pixmaps/terp-client/flag.png')
if pixbuf:
icon_set = gtk.IconSet (pixbuf)
factory.add ('terp-translate', icon_set)
tinyerp-2.1.3-client-syspath.patch:
--- NEW FILE tinyerp-2.1.3-client-syspath.patch ---
--- tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py.BAD 2005-08-01 19:29:30.000000000 -0500
+++ tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py 2005-08-01 19:29:39.000000000 -0500
@@ -54,7 +54,7 @@
for dirpath, dirnames, filenames in os.walk(path):
if '__init__.py' in filenames:
modname = dirpath.replace(os.path.sep, '.')
- yield modname.replace('bin', 'terp-client', 1)
+ yield modname.replace('bin', 'tinyerp_client', 1)
def translations():
trans = []
@@ -96,19 +96,19 @@
translations = translations(),
pot_file = 'bin/po/terp-msg.pot',
scripts = ['bin/tinyerp-client'],
- packages = ['terp-client', 'terp-client.common',
- 'terp-client.modules', 'terp-client.modules.action',
- 'terp-client.modules.gui',
- 'terp-client.modules.gui.window',
- 'terp-client.modules.gui.window.view_sel',
- 'terp-client.modules.gui.window.view_tree',
- 'terp-client.modules.spool',
- 'terp-client.printer', 'terp-client.tools',
- 'terp-client.widget',
- 'terp-client.widget.form',
- 'terp-client.widget.search',
- 'terp-client.widget.tree'] + list(find_plugins()),
- package_dir = {'terp-client': 'bin'},
+ packages = ['tinyerp_client', 'tinyerp_client.common',
+ 'tinyerp_client.modules', 'tinyerp_client.modules.action',
+ 'tinyerp_client.modules.gui',
+ 'tinyerp_client.modules.gui.window',
+ 'tinyerp_client.modules.gui.window.view_sel',
+ 'tinyerp_client.modules.gui.window.view_tree',
+ 'tinyerp_client.modules.spool',
+ 'tinyerp_client.printer', 'tinyerp_client.tools',
+ 'tinyerp_client.widget',
+ 'tinyerp_client.widget.form',
+ 'tinyerp_client.widget.search',
+ 'tinyerp_client.widget.tree'] + list(find_plugins()),
+ package_dir = {'tinyerp_client': 'bin'},
)
# this is now done by 'install_script'
--- tinyerp-2.1.3/tinyerp-client-2.1.3/bin/__init__.py.BAD 2005-08-02 15:20:40.000000000 -0500
+++ tinyerp-2.1.3/tinyerp-client-2.1.3/bin/__init__.py 2005-08-02 15:46:58.000000000 -0500
@@ -0,0 +1 @@
+
--- tinyerp-2.1.3/tinyerp-client-2.1.3/bin/tinyerp-client.BAD 2005-07-07 02:21:26.000000000 -0500
+++ tinyerp-2.1.3/tinyerp-client-2.1.3/bin/tinyerp-client 2005-08-03 11:51:46.000000000 -0500
@@ -52,6 +52,10 @@
os.environ['PATH']+=";GTK-2.0//lib;GTK-2.0//bin;"
sys.path.append('.')
+from distutils.sysconfig import get_python_lib
+terp_path = "/".join([get_python_lib(), 'tinyerp_client'])
+sys.path.append(terp_path)
+
import pygtk
pygtk.require('2.0')
import gtk
tinyerp-2.1.3-server-py24.patch:
--- NEW FILE tinyerp-2.1.3-server-py24.patch ---
--- tinyerp-2.1.3/tinyerp-server-2.1.3/setup.py.BAD 2005-08-01 12:59:31.000000000 -0500
+++ tinyerp-2.1.3/tinyerp-server-2.1.3/setup.py 2005-08-01 12:59:45.000000000 -0500
@@ -60,21 +60,21 @@
[f for f in glob.glob('doc/*') if os.path.isfile(f)]),
(opj('share','doc','tinyerp-server', 'i18n'),
glob.glob('doc/i18n/*')),
- (opj('lib', 'python2.3', 'site-packages', 'tinyerp_server', 'addons',
+ (opj('lib', 'python2.4', 'site-packages', 'tinyerp_server', 'addons',
'custom'),
glob.glob('bin/addons/custom/*xml') +
glob.glob('bin/addons/custom/*xsl'))]
for addon in find_addons():
add_path = addon.replace('.', os.path.sep).replace('tinyerp_server', 'bin',
1)
- pathfiles = [(opj('lib', 'python2.3', 'site-packages',
+ pathfiles = [(opj('lib', 'python2.4', 'site-packages',
add_path.replace('bin', 'tinyerp_server', 1)),
glob.glob(opj(add_path, '*xml')) +
glob.glob(opj(add_path, '*sql'))),
- (opj('lib', 'python2.3', 'site-packages',
+ (opj('lib', 'python2.4', 'site-packages',
add_path.replace('bin', 'tinyerp_server', 1), 'datas'),
glob.glob(opj(add_path, 'datas', '*xml'))),
- (opj('lib', 'python2.3', 'site-packages',
+ (opj('lib', 'python2.4', 'site-packages',
add_path.replace('bin', 'tinyerp_server', 1), 'report'),
glob.glob(opj(add_path, 'report', '*xml')) +
glob.glob(opj(add_path, 'report', '*xsl')))]
tinyerp-2.1.3-server-syspath.patch:
--- NEW FILE tinyerp-2.1.3-server-syspath.patch ---
--- tinyerp-2.1.3/tinyerp-server-2.1.3/bin/tinyerp-server.BAD 2005-08-03 14:10:39.000000000 -0500
+++ tinyerp-2.1.3/tinyerp-server-2.1.3/bin/tinyerp-server 2005-08-03 14:11:09.000000000 -0500
@@ -46,6 +46,10 @@
#----------------------------------------------------------
import os, signal, sys
+from distutils.sysconfig import get_python_lib
+terp_path = "/".join([get_python_lib(), 'tinyerp_server'])
+sys.path.append(terp_path)
+
#----------------------------------------------------------
# get logger
#----------------------------------------------------------
@@ -58,9 +62,9 @@
#-----------------------------------------------------------------------
import tools
if not tools.config['root_path']:
- tools.config['root_path'] = os.path.abspath(os.path.dirname(sys.argv[0]))
+ tools.config['root_path'] = os.path.abspath(terp_path)
if not tools.config['addons_path']:
- tools.config['addons_path'] = os.path.join(tools.config['root_path'], 'addons')
+ tools.config['addons_path'] = os.path.join(terp_path, 'addons')
#os.chdir(tools.file_path_root)
--- NEW FILE tinyerp.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=TinyERP
GenericName=ERP Client
Comment=Access TinyERP server
Exec=tinyerp-client
Icon=/usr/share/pixmaps/terp-client/tinyerp.png
StartupNotify=true
Terminal=false
Type=Application
Categories=Application;Internet;X-Fedora;
Version=2.1.3
X-Desktop-File-Install-Version=0.4
--- NEW FILE tinyerp.spec ---
%{?!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: 2.1.3
Release: 6%{?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
Source2: tinyerp.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python, pygtk2-devel, pygtk2-libglade
BuildRequires: python-psycopg, libxslt-python
BuildRequires: desktop-file-utils, xorg-x11-Xvfb
Requires: pygtk2, pygtk2-libglade
# FC-3 does not need this patch applied
Patch0: tinyerp-2.1.3-server-py24.patch
Patch1: tinyerp-2.1.3-client-correctver.patch
Patch2: tinyerp-2.1.3-client-syspath.patch
Patch3: tinyerp-2.1.3-client-flag.patch
Patch4: tinyerp-2.1.3-server-syspath.patch
%description
Tiny ERP is a free enterprise management software package. It
covers all domains for small to medium businesses; accounting,
stock management, sales, customer relationship, purchases,
project management...
%package server
Group: System Environment/Daemons
Summary: Open Source ERP Server
Requires: pygtk2, pygtk2-libglade
Requires: python-psycopg, libxslt-python
Requires: postgresql-python, libxml2-python
Requires: libxslt-python, python-imaging
Requires: python-psycopg, python-reportlab
Requires: graphviz, pyparsing, postgresql-server
%description server
Server components for Tiny ERP.
%prep
%setup -q -a 1 -c %{name}-%{version}
%if "%{pyver}" == "2.4"
%patch0 -p1
%endif
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
cd tinyerp-client-%{version}
/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
DISPLAY=:69 ./setup.py build
cd ../tinyerp-server-%{version}
DISPLAY=:69 ./setup.py build
%install
rm -rf $RPM_BUILD_ROOT
cd tinyerp-client-%{version}
/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
cd ../tinyerp-server-%{version}
DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
cd ..
%find_lang tinyerp-client
mv $RPM_BUILD_ROOT/%{_datadir}/terp-client/* $RPM_BUILD_ROOT/%{python_sitelib}/tinyerp_client
rm -rf $RPM_BUILD_ROOT/%{_datadir}/terp-client
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{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
ln -s ../../../../share/pixmaps/terp-client/$i $i
done
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}-client.lang
%doc
%defattr(-,root,root,0755)
%{_bindir}/tinyerp-client
%{python_sitelib}/tinyerp_client/
%{_defaultdocdir}/%{name}-client-%{version}/
%{_mandir}/man1/tinyerp-client.*
%{_datadir}/pixmaps/terp-client/
%{_datadir}/applications/*.desktop
%files server
%{_bindir}/tinyerp-server
%{python_sitelib}/tinyerp_server/
%{_defaultdocdir}/%{name}-server/
%{_mandir}/man1/tinyerp-server.*
%changelog
* Thu Aug 18 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.1.3-6
- use Xvfb to fake DISPLAY
* Wed Aug 3 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.1.3-5
- make patching more generic
- fix another server bug
* Wed Aug 3 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.1.3-4
- add more Requires
- add .desktop file for client
* Wed Aug 3 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.1.3-3
- move files around
* Wed Aug 3 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.1.3-2
- fix python to, you know, actually work
* Mon Aug 1 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.1.3-1
- initial package for Fedora Extras
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 18 Aug 2005 19:30:24 -0000 1.1
+++ .cvsignore 18 Aug 2005 19:31:23 -0000 1.2
@@ -0,0 +1,2 @@
+tinyerp-client-2.1.3.tar.gz
+tinyerp-server-2.1.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 18 Aug 2005 19:30:24 -0000 1.1
+++ sources 18 Aug 2005 19:31:23 -0000 1.2
@@ -0,0 +1,2 @@
+60c3e202f07be0ccac5abd6a733549f7 tinyerp-client-2.1.3.tar.gz
+9d4a0d90a29a089368c3fc24c9f4b8bc tinyerp-server-2.1.3.tar.gz
More information about the fedora-extras-commits
mailing list