rpms/tinyerp/devel tinyerp.spec,1.10,1.11

[Dan Horak (sharkcz)]

Author: sharkcz

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

Modified Files:
	tinyerp.spec 
Log Message:
 - updated Xorg dependencies



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tinyerp.spec	4 Jan 2006 10:54:00 -0000	1.10
+++ tinyerp.spec	4 Jan 2006 11:19:48 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -18,7 +18,8 @@
 BuildArch:	noarch
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
 BuildRequires:	python-psycopg, libxslt-python, pydot
-BuildRequires:	desktop-file-utils, xorg-x11-server-Xvfb
+BuildRequires:	desktop-file-utils
+BuildRequires:	xorg-x11-server-Xvfb, xorg-x11-fonts-base, xorg-x11-fonts-misc
 Requires:	pygtk2, pygtk2-libglade, pydot
 Patch0:		tinyerp-client.patch
 Patch1:		tinyerp-server.patch
@@ -52,7 +53,7 @@
 
 %build
 cd tinyerp-client-%{version}
-/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
+/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py build
 cd ../tinyerp-server-%{version}
 DISPLAY=:69 ./setup.py build
@@ -60,7 +61,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 cd tinyerp-client-%{version}
-/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
+/usr/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
@@ -135,6 +136,9 @@
 
 
 %changelog
+* Wed Jan  4 2006 Dan Horak <dan at danny.cz> 3.1.1-6
+- added new Xorg dependencies
+
 * Sun Dec 18 2005 Dan Horak <dan at danny.cz> 3.1.1-5
 - added Requires(postun) to the -server package (Ville Skyttä)
 - improved startup script, suggested by Enrico Scholz