rpms/tinyerp/F-10 .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 tinyerp.spec, 1.37, 1.38

Dan Horák sharkcz at fedoraproject.org
Fri Dec 5 20:28:57 UTC 2008 

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23374

Modified Files:
	.cvsignore sources tinyerp.spec 
Log Message:
* 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)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	17 Sep 2008 07:45:30 -0000	1.17
+++ .cvsignore	5 Dec 2008 20:28:27 -0000	1.18
@@ -1,2 +1,2 @@
-tinyerp-client-4.2.3.3.tar.gz
-tinyerp-server-4.2.3.3.tar.gz
+tinyerp-client-4.2.3.4.tar.gz
+tinyerp-server-4.2.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	17 Sep 2008 07:45:31 -0000	1.17
+++ sources	5 Dec 2008 20:28:27 -0000	1.18
@@ -1,2 +1,2 @@
-bc6db0ad92965c80753195265fceef29  tinyerp-client-4.2.3.3.tar.gz
-d7a87e27a895732de87f6e7091abcf8f  tinyerp-server-4.2.3.3.tar.gz
+1b5831851499db4a4322de36fa4d46a7  tinyerp-client-4.2.3.4.tar.gz
+7e9844e96df82c8c758aa046a19ace3a  tinyerp-server-4.2.3.4.tar.gz


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/F-10/tinyerp.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- tinyerp.spec	17 Sep 2008 07:45:31 -0000	1.37
+++ tinyerp.spec	5 Dec 2008 20:28:27 -0000	1.38
@@ -3,14 +3,14 @@
 
 
 Name:		tinyerp
-Version:	4.2.3.3
-Release:	1%{?dist}
+Version:	4.2.3.4
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
 URL:		http://tinyerp.org
-Source0:	http://tinyerp.org/download/stable/source/tinyerp-server-%{version}.tar.gz
-Source1:	http://tinyerp.org/download/stable/source/tinyerp-client-%{version}.tar.gz
+Source0:	http://openerp.com/download/stable/source/tinyerp-server-%{version}.tar.gz
+Source1:	http://openerp.com/download/stable/source/tinyerp-client-%{version}.tar.gz
 Source2:	tinyerp.desktop
 Source3:	tinyerp-server.conf
 Source4:	tinyerp-server
@@ -22,23 +22,27 @@
 BuildRequires:	python-psycopg, libxslt-python, pydot
 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
 
+%define srv_dir %{name}-server-%{version}
+%define cli_dir %{name}-client-%{version}
+
 %description
-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.
+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, pytz
 Requires:	python-psycopg, libxslt-python
-Requires:	postgresql-python, libxml2-python
+Requires:	postgresql-python, libxml2-python, PyXML
 Requires:	libxslt-python, python-imaging
 Requires:	python-psycopg, python-reportlab
 Requires:	graphviz, pyparsing, postgresql-server
@@ -54,35 +58,43 @@
 
 
 %prep
-%setup -q -T -a 0 -c -n %{name}-server-%{version}
-%setup -q -T -a 1 -c -n %{name}-client-%{version}
+%setup -q -a 1 -c %{name}-%{version}
 
-cd ..
 # update docs
-rm tinyerp-client-%{version}/doc/License.rtf
-cp %{SOURCE6} tinyerp-server-%{version}/doc/README.Fedora
+rm %{cli_dir}/doc/License.rtf
+rm %{srv_dir}/doc/License.rtf
+cp %{SOURCE6} %{srv_dir}/doc/README.Fedora
+chmod a-x %{srv_dir}/doc/tests/*.py
 
 # permission cleanup
-find tinyerp-server-%{version}/bin/addons -type f | xargs chmod a-x
+find %{srv_dir}/bin/addons -type f | xargs chmod a-x
 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
+
 
 %build
-cd ../tinyerp-client-%{version}
+pushd %{cli_dir}
 %{_xvfb} :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py build
-cd ../tinyerp-server-%{version}
+popd
+pushd %{srv_dir}
 DISPLAY=:69 ./setup.py build
+popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd ../tinyerp-client-%{version}
+pushd %{cli_dir}
 %{_xvfb} :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
-cd ../tinyerp-server-%{version}
+popd
+pushd %{srv_dir}
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
-cd ..
+popd
+
 %find_lang tinyerp-client
 
 mv $RPM_BUILD_ROOT%{_datadir}/tinyerp-client/* $RPM_BUILD_ROOT%{python_sitelib}/tinyerp-client
@@ -108,14 +120,24 @@
 # remove installed docs
 rm -r $RPM_BUILD_ROOT/%{_defaultdocdir}
 
+# add basic support for customizations in addons/custom
+mkdir $RPM_BUILD_ROOT%{_sysconfdir}/tinyerp-server
+pushd $RPM_BUILD_ROOT%{python_sitelib}/tinyerp-server/addons/custom
+for f in *.{py,xml,xsl,rml}
+do
+	mv $f $RPM_BUILD_ROOT%{_sysconfdir}/tinyerp-server
+	ln -s ../../../../../../../%{_sysconfdir}/tinyerp-server/$f $f
+done
+popd
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -f ../%{name}-client.lang
-%doc ../tinyerp-client-%{version}/doc/*
-%defattr(-,root,root,0755)
+%files -f %{name}-client.lang
+%defattr(-,root,root,-)
+%doc %{cli_dir}/doc/*
 %{_bindir}/tinyerp-client
 %{python_sitelib}/tinyerp-client/
 %{python_sitelib}/tinyerp_client*
@@ -125,12 +147,16 @@
 %{_datadir}/applications/*.desktop
 
 %files server
-%doc ../tinyerp-server-%{version}/doc/*
+%defattr(-,root,root,-)
+%doc %{srv_dir}/doc/*
 %attr(750,tinyerp,tinyerp) %dir /var/log/tinyerp
 %attr(750,tinyerp,tinyerp) %dir /var/spool/tinyerp
 %{_sysconfdir}/rc.d/init.d/tinyerp-server
 %config(noreplace) %{_sysconfdir}/tinyerp-server.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/tinyerp-server
+%dir %{_sysconfdir}/tinyerp-server
+%config(noreplace) %{_sysconfdir}/tinyerp-server/*
+%exclude %{_sysconfdir}/tinyerp-server/*.py?
 %{_bindir}/tinyerp-server
 %{python_sitelib}/tinyerp-server/
 %{python_sitelib}/tinyerp_server*
@@ -164,6 +190,17 @@
 
 
 %changelog
+* 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)
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 4.2.3.4-2
+- Rebuild for Python 2.6
+
+* Thu Nov 20 2008 Dan Horák <dan[at]danny.cz> 4.2.3.4-1
+- update to upstream version 4.2.3.4
+- spec and package cleanup
+
 * Wed Sep 16 2008 Dan Horak <dan[at]danny.cz> 4.2.3.3-1
 - update to upstream version 4.2.3.3

More information about the fedora-extras-commits mailing list