rpms/trac/devel trac.spec,1.20,1.21

[Jeffrey C. Ollie]

Author: jcollie

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

Modified Files:
	trac.spec 
Log Message:
* Tue Nov 18 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.11.2.1-0.1
- Update to 0.11.2.1



Index: trac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac/devel/trac.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- trac.spec	23 Jun 2008 03:07:51 -0000	1.20
+++ trac.spec	18 Nov 2008 14:35:25 -0000	1.21
@@ -1,19 +1,22 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.10.5
+Version:        0.11.2.1
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
 License:        BSD
 URL:            http://trac.edgewall.com/
-Source0:        http://ftp.edgewall.com/pub/trac/%{name}-%{version}.tar.gz
+Source0:        http://ftp.edgewall.com/pub/trac/Trac-%{version}.tar.gz
 Source1:        trac.conf
+Source2:        trac.ini
+Source3:        trac.ini-environment_sample
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  sed >= 3.95
 BuildRequires:  python-devel
-Requires:       python-clearsilver >= 0.9.3
+BuildRequires:  python-setuptools-devel
+Requires:       python-genshi >= 0.5
 Requires:       subversion >= 1.1
 Requires:       httpd
 Requires:       python-sqlite
@@ -29,11 +32,9 @@
 development more streamlined and effective.
 
 %prep
-%setup -q
-chmod -x contrib/*
-sed -i -e 's|/var/svn/test|/srv/svn|' trac/scripts/admin.py
-chmod -x htdocs/js/wikitoolbar.js
-sed -i -e 's/tracd 1/tracd 8/' scripts/tracd.1
+%setup -q -n Trac-%{version}
+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
 
@@ -47,15 +48,19 @@
 %{__python} setup.py install -O1 --root $RPM_BUILD_ROOT
 
 install -dm 755 $RPM_BUILD_ROOT%{_var}/www/cgi-bin
-mv $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin/trac.*cgi \
-  $RPM_BUILD_ROOT%{_var}/www/cgi-bin
-rm -r $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin
+mv cgi-bin/trac.*cgi $RPM_BUILD_ROOT%{_var}/www/cgi-bin
 
 install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d/trac.conf
+install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/trac/trac.ini
+install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/trac/trac.ini-environment_sample
+install -dpm 755 $RPM_BUILD_ROOT/etc/trac/{plugin,template}s.d
+
+find sample-plugins/ -type f -name '*.py' -exec install -pm 644 '{}' $RPM_BUILD_ROOT/etc/trac/plugins.d \;
+
+find sample-plugins/ -type f -name '*.ini*' -exec install -pm 644 '{}' $RPM_BUILD_ROOT/etc/trac/ \;
+
 install -dm 755 $RPM_BUILD_ROOT%{_sbindir}
 mv $RPM_BUILD_ROOT{%{_bindir}/tracd,%{_sbindir}/tracd}
-install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man8
-mv $RPM_BUILD_ROOT%{_mandir}/{man1/tracd.1,man8/tracd.8}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,13 +72,17 @@
 %{_sbindir}/tracd
 %{python_sitelib}/*
 %config(noreplace) /etc/httpd/conf.d/trac.conf
-%{_datadir}/trac/
+%config(noreplace) /etc/trac/*
 %{_var}/www/cgi-bin/trac.cgi
 %{_var}/www/cgi-bin/trac.fcgi
-%{_mandir}/man1/trac-admin.1*
-%{_mandir}/man8/tracd.8*
 
 %changelog
+* Tue Nov 18 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.11.2.1-0.1
+- Update to 0.11.2.1
+
+* Mon Jun 23 2008 Ryan B. Lynch <ryan.b.lynch at gmail.com> - 0.11-1
+- Update to 0.11
+
 * Sun Jun 22 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.5-1
 - Update to 0.10.5