[trac] Stop shipping trac.*gi files by default.

Jon Ciesla limb at fedoraproject.org
Mon Feb 6 15:55:37 UTC 2012


commit 114784c329f4fe033a6a5e9f162566eb724b42dc
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Feb 6 09:55:19 2012 -0600

    Stop shipping trac.*gi files by default.

 trac-README.fedora |    6 ++++++
 trac.spec          |   18 +++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/trac-README.fedora b/trac-README.fedora
index d5498e1..0e7202a 100644
--- a/trac-README.fedora
+++ b/trac-README.fedora
@@ -36,3 +36,9 @@ file = /etc/trac/trac.ini
 or use --inherit=/etc/trac/trac.ini when creating a new project
 
 See http://trac.edgewall.org/wiki/TracIni#GlobalConfiguration for more info.
+
+trac.*gi
+=============================================
+As of trac-0.12.2-8, we no longer ship trac.*gi files by default.
+The trac.wsgi file is now in /usr/share/doc/<NVR>/, and the config you need should
+be generated with trac-admin deploy per upstream.  See BZ 720760 for more information.
diff --git a/trac.spec b/trac.spec
index ebf5cb4..e4c8185 100644
--- a/trac.spec
+++ b/trac.spec
@@ -2,7 +2,7 @@
 
 Name:           trac
 Version:        0.12.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
 License:        BSD
@@ -51,8 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --root $RPM_BUILD_ROOT
 
 install -dm 755 $RPM_BUILD_ROOT%{_var}/www/cgi-bin
-mv cgi-bin/trac.*cgi $RPM_BUILD_ROOT%{_var}/www/cgi-bin
-install -Dpm 755 %{SOURCE5} $RPM_BUILD_ROOT%{_var}/www/cgi-bin
+#mv cgi-bin/trac.*cgi $RPM_BUILD_ROOT%{_var}/www/cgi-bin
+#install -Dpm 755 %{SOURCE5} $RPM_BUILD_ROOT%{_var}/www/cgi-bin
+install -Dpm 755 %{SOURCE5} 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
@@ -71,18 +72,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL README README.fedora RELEASE THANKS UPGRADE contrib/
+%doc AUTHORS ChangeLog COPYING INSTALL README README.fedora RELEASE THANKS UPGRADE contrib/ cgi-bin/trac.*gi
 %{_bindir}/trac-admin
 %{_sbindir}/tracd
 %{python_sitelib}/*
 ##%config(noreplace) /etc/httpd/conf.d/trac.conf
 %dir /etc/trac
 %config(noreplace) /etc/trac/*
-%{_var}/www/cgi-bin/trac.cgi
-%{_var}/www/cgi-bin/trac.fcgi
-%{_var}/www/cgi-bin/trac.wsgi
+#%{_var}/www/cgi-bin/trac.cgi
+#%{_var}/www/cgi-bin/trac.fcgi
+#%{_var}/www/cgi-bin/trac.wsgi
 
 %changelog
+* Mon Feb 06 2012 Jon Ciesla <limburgher at gmail.com> - 0.12.2-8
+- Only ship trac.wsgi in doc, updated README.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list