rpms/tinyerp/devel tinyerp-server.logrotate, NONE, 1.1 tinyerp.spec, 1.9, 1.10

[Dan Horak (sharkcz)]

Author: sharkcz

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

Modified Files:
	tinyerp.spec 
Added Files:
	tinyerp-server.logrotate 
Log Message:
 - synced devel from FC-4 version



--- NEW FILE tinyerp-server.logrotate ---
/var/log/tinyerp/*.log {
    copytruncate
    missingok
    notifempty
}


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tinyerp.spec	28 Nov 2005 18:09:17 -0000	1.9
+++ tinyerp.spec	4 Jan 2006 10:54:00 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	2%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -13,13 +13,13 @@
 Source2:	tinyerp.desktop
 Source3:	tinyerp-server.conf
 Source4:	tinyerp-server
+Source5:	tinyerp-server.logrotate
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
 BuildRequires:	python-psycopg, libxslt-python, pydot
-BuildRequires:	desktop-file-utils, xorg-x11-server-Xvfb, xorg-x11-fonts-misc
+BuildRequires:	desktop-file-utils, xorg-x11-server-Xvfb
 Requires:	pygtk2, pygtk2-libglade, pydot
-Requires(pre):	fedora-usermgmt
 Patch0:		tinyerp-client.patch
 Patch1:		tinyerp-server.patch
 
@@ -38,6 +38,9 @@
 Requires:	libxslt-python, python-imaging
 Requires:	python-psycopg, python-reportlab
 Requires:	graphviz, pyparsing, postgresql-server
+Requires:	ghostscript
+Requires(pre):	fedora-usermgmt
+Requires(postun):	fedora-usermgmt
 
 %description server
 Server components for Tiny ERP.
@@ -49,7 +52,7 @@
 
 %build
 cd tinyerp-client-%{version}
-/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate -fp /usr/share/X11/fonts/misc &
+/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py build
 cd ../tinyerp-server-%{version}
 DISPLAY=:69 ./setup.py build
@@ -57,7 +60,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 cd tinyerp-client-%{version}
-/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate -fp /usr/share/X11/fonts/misc &
+/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
@@ -78,6 +81,7 @@
 
 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
+install -m 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/tinyerp-server
 mkdir -p $RPM_BUILD_ROOT/var/log/tinyerp
 mkdir -p $RPM_BUILD_ROOT/var/spool/tinyerp
 
@@ -97,8 +101,9 @@
 %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
+%config(noreplace) %{_sysconfdir}/tinyerp-server.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/tinyerp-server
 %{_bindir}/tinyerp-server
 %{python_sitelib}/tinyerp-server/   
 %{_defaultdocdir}/%{name}-server-%{version}/
@@ -109,8 +114,6 @@
 /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
@@ -132,17 +135,19 @@
 
 
 %changelog
-* Mon Nov 28 2005 Dan Horak <dan at danny.cz> 3.1.1-1
-- update to TinyERP 3.1.1
+* 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
+- added log rotation
 
-* Wed Nov 23 2005 Dan Horak <dan at danny.cz> 3.1.0-4
-- modify BuildRequires again to support FC5
+* Sun Dec 11 2005 Dan Horak <dan at danny.cz> 3.1.1-4
+- moved Requires(pre) to the -server package (Ville Skyttä)
 
-* Tue Nov 22 2005 Dan Horak <dan at danny.cz> 3.1.0-3
-- modify path of Xvfb to support FC5
+* Thu Dec  7 2005 Dan Horak <dan at danny.cz> 3.1.1-3
+- chown for log and spool is not required
 
-* Sun Nov 20 2005 Dan Horak <dan at danny.cz> 3.1.0-2
-- modify BuildRequires to support FC5
+* Mon Nov 28 2005 Dan Horak <dan at danny.cz> 3.1.1-1
+- upgrade to tinyerp 3.1.1
 
 * Sun Nov 20 2005 Dan Horak <dan at danny.cz> 3.1.0-1
 - upgrade to tinyerp 3.1.x