[trac/el6: 11/11] Merge branch 'master' into el6

[Jon Ciesla]

commit c4a1447843788df6f0df73baf2326cd76683470b
Merge: f940dac 56982be
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Feb 9 10:13:08 2012 -0600

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	trac.spec

 .gitignore         |    1 +
 sources            |    2 +-
 trac-README.fedora |    6 ++++++
 trac.spec          |   45 ++++++++++++++++++++++++++++++++++++---------
 trac.wsgi          |   19 +++++++++++++++++++
 5 files changed, 63 insertions(+), 10 deletions(-)
---
diff --cc trac.spec
index ca863a1,9064620..e0e29db
--- a/trac.spec
+++ b/trac.spec
@@@ -75,22 -76,40 +78,46 @@@ rm -rf $RPM_BUILD_ROO
  %{_bindir}/trac-admin
  %{_sbindir}/tracd
  %{python_sitelib}/*
- %config(noreplace) /etc/httpd/conf.d/trac.conf
+ ##%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.cgi
+ #%{_var}/www/cgi-bin/trac.fcgi
+ #%{_var}/www/cgi-bin/trac.wsgi
  
  %changelog
+ * Thu Feb 09 2012 Jon Ciesla <limburgher at gmail.com> - 0.12.3-1
+ - Update to 0.12.3, BZ 788775.
+ 
+ * 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
+ 
 +* Tue Dec 20 2011 Kevin Fenzi <kevin at scrye.com> - 0.12.2-1
 +- Update to 0.12.2
 +
- * Fri Dec 10 2010 Jesse Keating <jkeating at redhat.com> - 0.12.1-4
+ * Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.2-6
+ - Rebuilt for glibc bug#747377
+ 
+ * Tue Jun 14 2011 Jon Ciesla <limb at jcomserv.net> - 0.12.2-5
+ - Added .wsgi file, BZ 701762.
+ - No longer ship mod_python trac.conf, deprecated.
+ 
+ * Sun Apr 03 2011 Jesse Keating <jkeating at redhat.com> - 0.12.2-1
+ - New upstream release mostly bugfixes
+ - http://trac.edgewall.org/browser//tags/trac-0.12.2/ChangeLog
+ 
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.1-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ * Fri Dec 10 2010 Jesse Keating <jkeating at redhat.com> - 0.12.1-3
  - Update the trac-README.fedora content for global ini
  
 +* Tue Dec 07 2010 Jesse Keating <jkeating at redhat.com> - 0.12.1-3
 +- Build 0.12.1 on el6, patched to use python-genshi06
 +
  * Fri Oct 15 2010 Jesse Keating <jkeating at redhat.com> - 0.12.1-2
  - Fix README.fedora installation