rpms/trac/devel trac.spec,1.31,1.32

[Felix Schwarz]

Author: fschwarz

Update of /cvs/pkgs/rpms/trac/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3825/devel

Modified Files:
	trac.spec 
Log Message:
dependency clean up, added README.fedora


Index: trac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac/devel/trac.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- trac.spec	5 Dec 2009 16:15:11 -0000	1.31
+++ trac.spec	24 Jan 2010 13:05:45 -0000	1.32
@@ -2,7 +2,7 @@
 
 Name:           trac
 Version:        0.11.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
 License:        BSD
@@ -11,16 +11,15 @@ Source0:        http://ftp.edgewall.com/
 Source1:        trac.conf
 Source2:        trac.ini
 Source3:        trac.ini-environment_sample
+Source4:        %{name}-README.fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  sed >= 3.95
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
+Requires:       python-setuptools
 Requires:       python-genshi >= 0.5
-Requires:       subversion >= 1.1
 Requires:       httpd
-Requires:       python-sqlite
-Requires:       python-pygments
 Provides:       trac-webadmin = trac-webadmin-0.1.2-0.7.dev_r4429.fc11
 Obsoletes:      trac-webadmin < trac-webadmin-0.1.2-0.6
 
@@ -40,6 +39,7 @@ find contrib -type f -exec chmod -x '{}'
 chmod -x trac/htdocs/js/wikitoolbar.js
 rm trac/test.py
 sed -i -e 's/\r//' contrib/trac-post-commit-hook.cmd
+%{__cp} -a %{SOURCE1} README.fedora
 
 %build
 %{__python} setup.py build
@@ -70,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL README* RELEASE THANKS UPGRADE contrib/
+%doc AUTHORS ChangeLog COPYING INSTALL README README.fedora RELEASE THANKS UPGRADE contrib/
 %{_bindir}/trac-admin
 %{_sbindir}/tracd
 %{python_sitelib}/*
@@ -81,6 +81,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_var}/www/cgi-bin/trac.fcgi
 
 %changelog
+* Sun Jan 24 2010 Felix Schwarz <felix.schwarz at oss.schwarz.eu> - 0.11.6-2
+- add missing setuptools requirement
+- removed python-sqlite requirement as Python 2.6 already contains a suitable
+  module in the standard library
+- removed dependencies on subversion and python-pygments as these are actually
+  optional
+- added README.fedora to explain which packages can be installed for 
+  additional functionality
+
 * Sat Dec 05 2009 Felix Schwarz <felix.schwarz at oss.schwarz.eu> - 0.11.6-1
 - New upstream release
 
@@ -238,4 +247,4 @@ rm -rf $RPM_BUILD_ROOT
 - Rebuild for FC4.
 
 * Fri Apr  8 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.1
-- First build.
+- First build.
\ No newline at end of file