rpms/tryton/EL-6 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 tryton.spec, 1.14, 1.15

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/tryton/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5339

Modified Files:
	.cvsignore sources tryton.spec 
Log Message:
* Tue Jul 27 2010 Dan Horák <dan[at]danny.cz> 1.6.1-1
- update to upstream version 1.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/EL-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 Jul 2010 16:50:24 -0000	1.11
+++ .cvsignore	27 Jul 2010 08:36:13 -0000	1.12
@@ -1 +1 @@
-tryton-1.6.0.tar.gz
+tryton-1.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/EL-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 Jul 2010 16:50:24 -0000	1.11
+++ sources	27 Jul 2010 08:36:13 -0000	1.12
@@ -1 +1 @@
-cb8c30f5c27fd31eda133d37fc101f7b  tryton-1.6.0.tar.gz
+30f5acf80f2505bcee7cc2166e6cd630  tryton-1.6.1.tar.gz


Index: tryton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/EL-6/tryton.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- tryton.spec	20 Jul 2010 10:38:55 -0000	1.14
+++ tryton.spec	27 Jul 2010 08:36:13 -0000	1.15
@@ -1,8 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%if 0%{?fedora} || 0%{?rhel} >= 6
+%define with_docs 1
+%else
+%define with_docs 0
+%endif
+
 Name:           tryton
-Version:        1.6.0
-Release:        2%{?dist}
+Version:        1.6.1
+Release:        1%{?dist}
 Summary:        Client for the Tryton application framework
 
 Group:          Applications/Productivity
@@ -15,7 +21,9 @@ BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 BuildRequires:  desktop-file-utils
+%if %{with_docs}
 BuildRequires:  python-sphinx
+%endif
 Requires:       pygtk2
 Requires:       librsvg2
 Requires:       mx
@@ -36,9 +44,11 @@ in the trytond package.
 %build
 %{__python} setup.py build
 
+%if %{with_docs}
 pushd doc
 make html
 popd
+%endif
 
 
 %install
@@ -64,7 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc CHANGELOG COPYRIGHT INSTALL LICENSE README TODO
+%if %{with_docs}
 %doc doc/_build/html
+%endif
 %{_bindir}/%{name}
 %{python_sitelib}/*
 %{_datadir}/pixmaps/%{name}
@@ -73,6 +85,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jul 27 2010 Dan Horák <dan[at]danny.cz> 1.6.1-1
+- update to upstream version 1.6.1
+
+* Thu Jul 22 2010 Dan Horák <dan[at]danny.cz> 1.6.0-3.1
+- don't build docs on EL <= 5
+
+* Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 1.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
 * Thu Jul 15 2010 Dan Horák <dan[at]danny.cz> 1.6.0-2
 - build documentation
 - add missing R: python-dateutil