rpms/tinyerp/devel tinyerp-client.patch, NONE, 1.1 tinyerp-server, NONE, 1.1 tinyerp-server.conf, NONE, 1.1 tinyerp-server.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tinyerp.desktop, 1.1, 1.2 tinyerp.spec, 1.2, 1.3 tinyerp-2.1.3-client-correctver.patch, 1.1, NONE tinyerp-2.1.3-client-flag.patch, 1.1, NONE tinyerp-2.1.3-client-syspath.patch, 1.2, NONE tinyerp-2.1.3-server-py24.patch, 1.1, NONE tinyerp-2.1.3-server-syspath.patch, 1.1, NONE
Dan Horak (sharkcz)
fedora-extras-commits at redhat.com
Sun Nov 20 18:25:34 UTC 2005
Author: sharkcz
Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22597/devel
Modified Files:
.cvsignore sources tinyerp.desktop tinyerp.spec
Added Files:
tinyerp-client.patch tinyerp-server tinyerp-server.conf
tinyerp-server.patch
Removed 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
Log Message:
auto-import tinyerp-3.1.0-1 on branch devel from tinyerp-3.1.0-1.src.rpm
tinyerp-client.patch:
--- NEW FILE tinyerp-client.patch ---
diff -Nru tinyerp-client-3.1.0.orig/bin/VERSION tinyerp-client-3.1.0/bin/VERSION
--- tinyerp-client-3.1.0.orig/bin/VERSION 2005-09-26 10:46:22.000000000 +0200
+++ tinyerp-client-3.1.0/bin/VERSION 2005-10-12 15:29:19.000000000 +0200
@@ -1 +1 @@
-3.0.3
+3.1.0
diff -Nru tinyerp-client-3.1.0.orig/setup.py tinyerp-client-3.1.0/setup.py
--- tinyerp-client-3.1.0.orig/setup.py 2005-09-18 16:19:18.000000000 +0200
+++ tinyerp-client-3.1.0/setup.py 2005-10-12 15:28:07.000000000 +0200
@@ -18,7 +18,7 @@
opj = os.path.join
name = 'tinyerp-client'
-version = '3.0.2'
+version = '3.1.0'
# 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
-included_plugins = ['auction_lots_html', 'huissier', 'slideshow', 'workflow_print']
+included_plugins = ['workflow_print']
def find_plugins():
for plugin in included_plugins:
--- NEW FILE tinyerp-server ---
#!/bin/bash
# tinyerp-server This shell script takes care of starting and stopping
# TinyERP server
#
# chkconfig: - 95 05
# description: TinyERP Server
#
# pidfile: /var/run/tinyerp-server.pid
# config: /etc/tinyerp-server.conf
PATH=/usr/bin:/sbin:/bin:/usr/sbin
export PATH
# Source function library.
. /etc/rc.d/init.d/functions
OPTS=""
prog="tinyerp-server"
# check if the tinyerp-server conf file is present, then use it
if [ -f /etc/tinyerp-server.conf ]; then
OPTS="-c /etc/tinyerp-server.conf"
fi
# check the existence of the tinyerp-server script
[ -z "/usr/bin/tinyerp-server" ] && exit 0
RETVAL=0
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"
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
return $RETVAL
}
stop() {
echo -n $"Stopping $prog: "
kill -TERM `cat /var/run/tinyerp-server.pid` > /dev/null 2>&1
RETVAL=$?
if [ $RETVAL -eq 0 ] ; then
rm -f /var/lock/subsys/tinyerp-server
rm -f /var/run/tinyerp-server.pid
echo_success
echo
else
echo_failure
echo
fi
return $RETVAL
}
restart() {
stop
start
}
condrestart() {
[ -e /var/lock/subsys/tinyerp-server ] && restart || :
}
rhstatus() {
status tinyerp-server
}
case "$1" in
start)
start
;;
stop)
stop
;;
restart)
restart
;;
condrestart)
condrestart
;;
status)
rhstatus
;;
probe)
exit 0
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart}"
exit 1
esac
exit $?
--- NEW FILE tinyerp-server.conf ---
[options]
without_demo = False
root_path = None
verbose = False
xmlrpc = True
db_user = tinyerp
db_password = False
webdb_host = False
webdb_name = False
soap = False
db_host = False
webdb_user = False
webdb_password = False
db_name = tinyerp
webdb_port = False
demo = {}
interface =
netrpc = True
db_port = False
port = 8069
addons_path = None
reportgz = False
tinyerp-server.patch:
--- NEW FILE tinyerp-server.patch ---
diff -Nru tinyerp-server-3.1.0.orig/bin/PKG-INFO tinyerp-server-3.1.0/bin/PKG-INFO
--- tinyerp-server-3.1.0.orig/bin/PKG-INFO 2005-09-12 09:11:17.000000000 +0200
+++ tinyerp-server-3.1.0/bin/PKG-INFO 2005-10-12 15:29:03.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: Tiny ERP
-Version: 2.0.9
+Version: 3.1.0
Author: Tiny.be
Author-email: fp at tiny be
Maintainer: Tiny.be
diff -Nru tinyerp-server-3.1.0.orig/bin/VERSION tinyerp-server-3.1.0/bin/VERSION
--- tinyerp-server-3.1.0.orig/bin/VERSION 2005-09-26 10:53:38.000000000 +0200
+++ tinyerp-server-3.1.0/bin/VERSION 2005-10-12 15:29:08.000000000 +0200
@@ -1 +1 @@
-3.0.3
+3.1.0
diff -Nru tinyerp-server-3.1.0.orig/setup.py tinyerp-server-3.1.0/setup.py
--- tinyerp-server-3.1.0.orig/setup.py 2005-09-18 16:16:19.000000000 +0200
+++ tinyerp-server-3.1.0/setup.py 2005-10-12 15:53:23.000000000 +0200
@@ -21,7 +21,7 @@
opj = os.path.join
name = 'tinyerp-server'
-version = '3.0.2'
+version = '3.1.0'
# get python short version
py_short_version = '%s.%s' % sys.version_info[:2]
@@ -61,9 +61,9 @@
'''Build list of data files to be installed'''
files = [(opj('share', 'man', 'man1'),
['man/tinyerp-server.1']),
- (opj('share','doc', 'tinyerp-server'),
+ (opj('share','doc', 'tinyerp-server-%s' % version),
[f for f in glob.glob('doc/*') if os.path.isfile(f)]),
- (opj('share','doc','tinyerp-server', 'i18n'),
+ (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') +
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 18 Aug 2005 19:31:23 -0000 1.2
+++ .cvsignore 20 Nov 2005 18:25:32 -0000 1.3
@@ -1,2 +1,2 @@
-tinyerp-client-2.1.3.tar.gz
-tinyerp-server-2.1.3.tar.gz
+tinyerp-client-3.1.0.tar.gz
+tinyerp-server-3.1.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 18 Aug 2005 19:31:23 -0000 1.2
+++ sources 20 Nov 2005 18:25:32 -0000 1.3
@@ -1,2 +1,2 @@
-60c3e202f07be0ccac5abd6a733549f7 tinyerp-client-2.1.3.tar.gz
-9d4a0d90a29a089368c3fc24c9f4b8bc tinyerp-server-2.1.3.tar.gz
+b933fedc030c54abe1269542ede1ec95 tinyerp-client-3.1.0.tar.gz
+a757f4b6c3e286d3967fc1f803652659 tinyerp-server-3.1.0.tar.gz
Index: tinyerp.desktop
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp.desktop 18 Aug 2005 19:31:23 -0000 1.1
+++ tinyerp.desktop 20 Nov 2005 18:25:32 -0000 1.2
@@ -4,10 +4,10 @@
GenericName=ERP Client
Comment=Access TinyERP server
Exec=tinyerp-client
-Icon=/usr/share/pixmaps/terp-client/tinyerp.png
+Icon=/usr/share/pixmaps/tinyerp-client/tinyerp.png
StartupNotify=true
Terminal=false
Type=Application
Categories=Application;Internet;X-Fedora;
-Version=2.1.3
+Version=3.0.1
X-Desktop-File-Install-Version=0.4
Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp.spec 17 Sep 2005 14:07:13 -0000 1.2
+++ tinyerp.spec 20 Nov 2005 18:25:32 -0000 1.3
@@ -1,9 +1,9 @@
-%{?!pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')}
+%{?!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: 7%{?dist}
+Version: 3.1.0
+Release: 1
License: GPL
Group: Applications/Productivity
Summary: Open Source ERP Client
@@ -11,18 +11,17 @@
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
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
+Requires: pygtk2, pygtk2-libglade, pydot
+Requires(pre): fedora-usermgmt
+Patch0: tinyerp-client.patch
+Patch1: tinyerp-server.patch
%description
Tiny ERP is a free enterprise management software package. It
@@ -45,13 +44,8 @@
%prep
%setup -q -a 1 -c %{name}-%{version}
-%if "%{pyver}" == "2.4"
-%patch0 -p1
-%endif
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch0
+%patch1
%build
cd tinyerp-client-%{version}
@@ -70,18 +64,23 @@
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
+mv $RPM_BUILD_ROOT/%{_datadir}/tinyerp-client/* $RPM_BUILD_ROOT/%{python_sitelib}/tinyerp-client
+rm -rf $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
+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
+ ln -s ../../../../share/pixmaps/tinyerp-client/$i $i
done
+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
+mkdir -p $RPM_BUILD_ROOT/var/log/tinyerp
+mkdir -p $RPM_BUILD_ROOT/var/spool/tinyerp
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -89,21 +88,52 @@
%doc
%defattr(-,root,root,0755)
%{_bindir}/tinyerp-client
-%{python_sitelib}/tinyerp_client/
+%{python_sitelib}/tinyerp-client/
%{_defaultdocdir}/%{name}-client-%{version}/
%{_mandir}/man1/tinyerp-client.*
-%{_datadir}/pixmaps/terp-client/
+%{_datadir}/pixmaps/tinyerp-client/
%{_datadir}/applications/*.desktop
%files server
+%attr(750,tinyerp,tinyerp) %dir /var/log/tinyerp
+%attr(750,tinyerp,tinyerp) %dir /var/spool/tinyerp
+%config(noreplace) %{_sysconfdir}/tinyerp-server.conf
+%{_sysconfdir}/rc.d/init.d/tinyerp-server
%{_bindir}/tinyerp-server
-%{python_sitelib}/tinyerp_server/
-%{_defaultdocdir}/%{name}-server/
+%{python_sitelib}/tinyerp-server/
+%{_defaultdocdir}/%{name}-server-%{version}/
%{_mandir}/man1/tinyerp-server.*
+%pre server
+/usr/sbin/fedora-groupadd 13 -r tinyerp &>/dev/null || :
+/usr/sbin/fedora-useradd 13 -r -s /sbin/nologin -d /var/spool/tinyerp -M \
+ -c 'TinyERP Server Owner' -g tinyerp tinyerp &>/dev/null || :
+
+chown -R tinyerp:tinyerp /var/log/tinyerp /var/spool/tinyerp
+
+exit 0
+
+%post server
+/sbin/chkconfig --add tinyerp-server
+
+%preun server
+if [ $1 = 0 ] ; then
+ 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
+fi
+test "$1" != 0 || /usr/sbin/fedora-userdel tinyerp &>/dev/null || :
+test "$1" != 0 || /usr/sbin/fedora-groupdel tinyerp &>/dev/null || :
+
+
%changelog
-* Sat Sep 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.1.3-7
-- fix missing plugin (Dan Horák)
+* Sun Nov 20 2005 Dan Horak <dan at danny.cz> 3.1.0-1
+- upgrade to tinyerp 3.1.x
* Thu Aug 18 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.1.3-6
- use Xvfb to fake DISPLAY
--- tinyerp-2.1.3-client-correctver.patch DELETED ---
--- tinyerp-2.1.3-client-flag.patch DELETED ---
--- tinyerp-2.1.3-client-syspath.patch DELETED ---
--- tinyerp-2.1.3-server-py24.patch DELETED ---
--- tinyerp-2.1.3-server-syspath.patch DELETED ---
More information about the fedora-extras-commits
mailing list