rpms/tinyerp/devel tinyerp-client-4.2.3.4-setup.patch, NONE, 1.1 tinyerp-server-4.2.3.4-setup.patch, NONE, 1.1 tinyerp.spec, 1.40, 1.41

[Dan Horák]

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6199

Modified Files:
	tinyerp.spec 
Added Files:
	tinyerp-client-4.2.3.4-setup.patch 
	tinyerp-server-4.2.3.4-setup.patch 
Log Message:
* Mon Feb 23 2009 Dan Horák <dan[at]danny.cz> 4.2.3.4-4
- cleanup the build requirements, drop dependency on running X server


tinyerp-client-4.2.3.4-setup.patch:

--- NEW FILE tinyerp-client-4.2.3.4-setup.patch ---
diff -Nrup tinyerp-client-4.2.3.4.orig/setup.py tinyerp-client-4.2.3.4/setup.py
--- tinyerp-client-4.2.3.4.orig/setup.py	2008-11-06 11:44:54.000000000 +0100
+++ tinyerp-client-4.2.3.4/setup.py	2009-02-23 11:24:39.000000000 +0100
@@ -29,8 +29,7 @@ execfile(opj('bin', 'release.py'))
 # get python short version
 py_short_version = '%s.%s' % sys.version_info[:2]
 
-required_modules = [('gtk', 'gtk python bindings'),
-                    ('gtk.glade', 'glade python bindings')]
+required_modules = []
 
 def check_modules():
     ok = True

tinyerp-server-4.2.3.4-setup.patch:

--- NEW FILE tinyerp-server-4.2.3.4-setup.patch ---
diff -Nrup tinyerp-server-4.2.3.4.orig/setup.py tinyerp-server-4.2.3.4/setup.py
--- tinyerp-server-4.2.3.4.orig/setup.py	2008-11-06 11:42:44.000000000 +0100
+++ tinyerp-server-4.2.3.4/setup.py	2009-02-23 11:42:33.000000000 +0100
@@ -30,10 +30,7 @@ execfile(opj('bin', 'release.py'))
 # get python short version
 py_short_version = '%s.%s' % sys.version_info[:2]
 
-required_modules = [('psycopg', 'PostgreSQL module'),
-                    ('xml', 'XML Tools for python'),
-                    ('libxml2', 'libxml2 python bindings'),
-                    ('libxslt', 'libxslt python bindings')]
+required_modules = []
 
 def check_modules():
     ok = True


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- tinyerp.spec	5 Dec 2008 19:51:27 -0000	1.40
+++ tinyerp.spec	23 Feb 2009 11:10:52 -0000	1.41
@@ -4,7 +4,7 @@
 
 Name:		tinyerp
 Version:	4.2.3.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -18,14 +18,13 @@
 Source6:	README.Fedora
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
-BuildRequires:	python, pygtk2-devel, pygtk2-libglade
-BuildRequires:	python-psycopg, libxslt-python, pydot
+# pygtk2 is required for gtk.dsextras module
+BuildRequires:	python-devel pygtk2
 BuildRequires:	desktop-file-utils
-BuildRequires:	xorg-x11-server-Xvfb, xorg-x11-fonts-base
 BuildRequires:	dos2unix
 Requires:	pygtk2, pygtk2-libglade, pydot, mx, python-matplotlib
-
-%define _xvfb /usr/bin/Xvfb
+Patch0:		tinyerp-client-4.2.3.4-setup.patch
+Patch1:		tinyerp-server-4.2.3.4-setup.patch
 
 %define srv_dir %{name}-server-%{version}
 %define cli_dir %{name}-client-%{version}
@@ -59,6 +58,8 @@
 
 %prep
 %setup -q -a 1 -c %{name}-%{version}
+%patch0 -p0
+%patch1 -p0
 
 # update docs
 rm %{cli_dir}/doc/License.rtf
@@ -71,28 +72,26 @@
 find tinyerp-client-%{version}/bin/themes -type f | xargs chmod a-x
 
 # fix EOLs
-dos2unix %{cli_dir}/doc/README.txt
-dos2unix %{srv_dir}/doc/README.txt
+dos2unix --keepdate %{cli_dir}/doc/README.txt
+dos2unix --keepdate %{srv_dir}/doc/README.txt
 
 
 %build
 pushd %{cli_dir}
-%{_xvfb} :69 -nolisten tcp -ac -terminate &
-DISPLAY=:69 ./setup.py build
+./setup.py build
 popd
 pushd %{srv_dir}
-DISPLAY=:69 ./setup.py build
+./setup.py build
 popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 pushd %{cli_dir}
-%{_xvfb} :69 -nolisten tcp -ac -terminate &
-DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
+./setup.py install --root=$RPM_BUILD_ROOT
 popd
 pushd %{srv_dir}
-DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
+./setup.py install --root=$RPM_BUILD_ROOT
 popd
 
 %find_lang tinyerp-client
@@ -190,6 +189,9 @@
 
 
 %changelog
+* Mon Feb 23 2009 Dan Horák <dan[at]danny.cz> 4.2.3.4-4
+- cleanup the build requirements, drop dependency on running X server
+
 * Fri Dec  5 2008 Dan Horák <dan[at]danny.cz> 4.2.3.4-3
 - add PyXML as dependency for the server subpackage (Resolves: #474674)
 - add basic support for customizations stored in addons/custom (Resolves: #466089)