rpms/tinyerp/devel .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 tinyerp-server, 1.3, 1.4 tinyerp.desktop, 1.5, 1.6 tinyerp.spec, 1.29, 1.30 tinyerp-client-l10n.patch, 1.1, NONE tinyerp-server-4.0.3-xmlrpc.patch, 1.1, NONE

[Dan Horak (sharkcz)]

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5397

Modified Files:
	.cvsignore sources tinyerp-server tinyerp.desktop tinyerp.spec 
Removed Files:
	tinyerp-client-l10n.patch tinyerp-server-4.0.3-xmlrpc.patch 
Log Message:
* Wed Oct 31 2007 Dan Horak <dan[at]danny.cz> 4.2.0-1
- update to upstream version 4.2.0
- add Requires for scriptlets
- update init script (#247074)
- spec file cleanup, remove support for FC <= 4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	30 Mar 2007 10:40:44 -0000	1.13
+++ .cvsignore	31 Oct 2007 20:06:35 -0000	1.14
@@ -1,2 +1,2 @@
-tinyerp-client-4.0.3.tar.gz
-tinyerp-server-4.0.3.tar.gz
+tinyerp-client-4.2.0.tar.gz
+tinyerp-server-4.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	30 Mar 2007 10:40:44 -0000	1.13
+++ sources	31 Oct 2007 20:06:35 -0000	1.14
@@ -1,2 +1,2 @@
-d951f03e6ac5853028498d5a7adb5a22  tinyerp-client-4.0.3.tar.gz
-afb7b58d1dde3b70f65cdb9fb9f4a2f1  tinyerp-server-4.0.3.tar.gz
+6dd14e81980c6e12d998c61e6264b88f  tinyerp-client-4.2.0.tar.gz
+85ebc7eb8f62229fb851225713a581d8  tinyerp-server-4.2.0.tar.gz


Index: tinyerp-server
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-server,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tinyerp-server	18 Mar 2006 14:09:22 -0000	1.3
+++ tinyerp-server	31 Oct 2007 20:06:35 -0000	1.4
@@ -8,6 +8,17 @@
 # pidfile: /var/run/tinyerp-server.pid
 # config: /etc/tinyerp-server.conf
 
+### BEGIN INIT INFO
+# Provides: tinyerp-server
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Default-Start:
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: start and stop tinyerp-server
+# Description: TinyERP Server
+### END INIT INFO
+
+
 PATH=/usr/bin:/sbin:/bin:/usr/sbin
 export PATH
 


Index: tinyerp.desktop
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.desktop,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tinyerp.desktop	26 Sep 2007 09:23:18 -0000	1.5
+++ tinyerp.desktop	31 Oct 2007 20:06:35 -0000	1.6
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=TinyERP
 GenericName=ERP Client
 Comment=Access TinyERP server


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tinyerp.spec	16 Oct 2007 17:13:51 -0000	1.29
+++ tinyerp.spec	31 Oct 2007 20:06:35 -0000	1.30
@@ -1,27 +1,10 @@
-#### 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:	4.0.3
-Release:	3%{?dist}
+Version:	4.2.0
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -38,27 +21,22 @@
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
 BuildRequires:	python-psycopg, libxslt-python, pydot
 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-l10n.patch
-Patch100:	tinyerp-server-4.0.3-xmlrpc.patch
+
+%define _xvfb /usr/bin/Xvfb
 
 %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...
+Tiny ERP is a complete ERP and CRM. The main features are accounting (analytic
+and financial), stock management, sales and purchases management, tasks
+automation, marketing campaigns, help desk, POS, etc. Technical features include
+a distributed server, flexible workflows, an object database, a dynamic GUI,
+customizable reports, and SOAP and XML-RPC interfaces.
 
 %package server
 Group:		System Environment/Daemons
 Summary:	Open Source ERP Server
-Requires:	pygtk2, pygtk2-libglade
+Requires:	pygtk2, pygtk2-libglade, pytz
 Requires:	python-psycopg, libxslt-python
 Requires:	postgresql-python, libxml2-python
 Requires:	libxslt-python, python-imaging
@@ -67,23 +45,26 @@
 Requires:	ghostscript
 Requires(pre):	fedora-usermgmt
 Requires(postun):	fedora-usermgmt
+Requires(post):		/sbin/chkconfig
+Requires(preun):	/sbin/chkconfig
+Requires(preun):	/sbin/service
 
 %description server
 Server components for Tiny ERP.
 
+
 %prep
 %setup -q -a 1 -c %{name}-%{version}
-pushd tinyerp-client-%{version}
-%patch0
-popd
-%patch100
 
+# update docs
+rm tinyerp-client-%{version}/doc/License.rtf
 cp %{SOURCE6} tinyerp-server-%{version}/doc/README.Fedora
 
 # permission cleanup
 find tinyerp-server-%{version}/bin/addons -type f | xargs chmod a-x
 find tinyerp-client-%{version}/bin/themes -type f | xargs chmod a-x
 
+
 %build
 cd tinyerp-client-%{version}
 %{_xvfb} :69 -nolisten tcp -ac -terminate &
@@ -91,6 +72,7 @@
 cd ../tinyerp-server-%{version}
 DISPLAY=:69 ./setup.py build
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 cd tinyerp-client-%{version}
@@ -121,15 +103,19 @@
 mkdir -p $RPM_BUILD_ROOT/var/log/tinyerp
 mkdir -p $RPM_BUILD_ROOT/var/spool/tinyerp
 
+# remove installed docs
+rm -r $RPM_BUILD_ROOT/%{_defaultdocdir}
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files -f %{name}-client.lang
-%doc 
+%doc tinyerp-client-%{version}/doc/*
 %defattr(-,root,root,0755)
 %{_bindir}/tinyerp-client
 %{python_sitelib}/tinyerp-client/
-%{_defaultdocdir}/%{name}-client-%{version}/
 %{_mandir}/man1/tinyerp-client.*
 %{_datadir}/tinyerp-client/
 %{_datadir}/pixmaps/tinyerp-client/
@@ -147,6 +133,7 @@
 %{_mandir}/man1/tinyerp-server.*
 %{_mandir}/man5/terp_serverrc.*
 
+
 %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 \
@@ -159,20 +146,26 @@
 
 %preun server
 if [ $1 = 0 ] ; then
-	service tinyerp-server stop >/dev/null 2>&1
+	/sbin/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
+	/sbin/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
+* Wed Oct 31 2007 Dan Horak <dan[at]danny.cz> 4.2.0-1
+- update to upstream version 4.2.0
+- add Requires for scriptlets
+- update init script (#247074)
+- spec file cleanup, remove support for FC <= 4
+
 * Tue Oct 16 2007 Dan Horak <dan[at]danny.cz> 4.0.3-3
 - fix problem with xmlrpc from Python 2.5 (#334121)
 


--- tinyerp-client-l10n.patch DELETED ---


--- tinyerp-server-4.0.3-xmlrpc.patch DELETED ---