Bump up to 1.1.14.

Conflicts:
	viewvc.spec

.gitignore

@@ -6,3 +6,4 @@ viewvc-1.1.6.tar.gz
 /viewvc-1.1.11.tar.gz
 /viewvc-1.1.12.tar.gz
 /viewvc-1.1.13.tar.gz
+/viewvc-1.1.14.tar.gz

sources

@@ -1 +1 @@
-c6710daca7bbd161ab68d5921757cd21  viewvc-1.1.13.tar.gz
+ba8af23f4a524625441840f779c30086  viewvc-1.1.14.tar.gz

viewvc.conf

@@ -4,6 +4,7 @@ Alias /viewvc-static __datadir__/viewvc/templates/docroot
 <Directory __python_sitelib__/viewvc/bin/mod_python>
     AddHandler python-program .py
     PythonHandler handler
+    PythonPath "sys.path+['__python_sitelib__/viewvc/bin/mod_python']"
     Order allow,deny
     Allow from 127.0.0.1
 </Directory>

viewvc.spec

@@ -1,7 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+# EL4 has a subversion that does not meet the minimum reqs for subversion
+%if 0%{?rhel} && "%rhel" < "5"
+%define with_subversion 0
+%else
+%define with_subversion 1
+%endif
+
+
 Name:           viewvc
-Version:        1.1.13
+Version:        1.1.14
 Release:        1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
@@ -20,8 +28,9 @@ Conflicts:      selinux-policy < 2.5.10-2
 BuildArch:      noarch
 BuildRequires:  python-devel >= 2.0, python-pygments
 Requires:       rcs, diffutils
+%if 0%{with_subversion}
 Requires:       subversion >= 1.2
-Requires:       subversion-python >= 1.2
+%endif
 Requires:       cvsgraph
 Requires:       python-pygments
 
@@ -33,10 +42,15 @@ as well as diffs between those versions. Basically, ViewVC provides the bulk
 of the report-like functionality you expect out of your version control tool,
 but much more prettily than the average textual command-line program output.
 
+%if 0%{!?with_subversion}
+This version only supports CVS repositories.
+%endif
+
 %package httpd
 Summary:        ViewVC configuration for Apache/mod_python
 Group:          Development/Tools
 Requires:       httpd, %{name} = %{version}-%{release}, mod_python
+Obsoletes:      viewvc < 1.1.0
 
 %description httpd
 ViewVC configuration for Apache/mod_python. This package should provide ViewVC
@@ -119,108 +133,63 @@ with decent performance when run under Apache.
 %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc
 
 %changelog
+* Wed Jun 13 2012 Bojan Smojver <bojan@rexursive.com> - 1.1.14-1
+- bump up to 1.1.14
+
 * Tue Jan 24 2012 Bojan Smojver <bojan@rexursive.com> - 1.1.13-1
 - bump up to 1.1.13
 
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.12-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
 * Fri Nov  4 2011 Bojan Smojver <bojan@rexursive.com> - 1.1.12-1
 - bump up to 1.1.12
 
-* Tue Nov  1 2011 Bojan Smojver <bojan@rexursive.com> - 1.1.11-3
-- require subversion-python
-
-* Wed Jun  1 2011 Bojan Smojver <bojan@rexursive.com> - 1.1.11-2
+* Wed Jun  1 2011 Bojan Smojver <bojan@rexursive.com> - 1.1.11-3
 - in response to bug #708721:
 -   remove webserver dependency, can run standalone
 -   require httpd for httpd package
 -   move spool directory to httpd package
 
+* Wed May 18 2011 Bojan Smojver <bojan@rexursive.com> - 1.1.11-2
+- remove duplicate conf section
+
 * Wed May 18 2011 Bojan Smojver <bojan@rexursive.com> - 1.1.11-1
 - bump up to 1.1.11
 
 * Wed Mar 16 2011 Bojan Smojver <bojan@rexursive.com> - 1.1.10-1
 - bump up to 1.1.10
 
-* Mon Feb 21 2011 Bojan Smojver <bojan@rexursive.com> - 1.1.9-1
+* Tue Mar  8 2011 Bojan Smojver <bojan@rexursive.com> - 1.1.9-1
 - bump up to 1.1.9
 
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Dec  6 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.8-1
+* Tue Dec  7 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.8-1
 - bump up to 1.1.8
 
-* Fri Sep 10 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.7-1
-- bump up to 1.1.7
-- address bug #565805, allow access to templates from localhost
-
-* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.1.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
-
 * Thu Jun  3 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.6-1
 - bump up to 1.1.6
 - drop patch for upstream issue #454
 
-* Tue May 25 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.5-2
+* Tue May 25 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.5-3
 - patch upstream issue #454
 
+* Thu Apr  1 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.5-2
+- pull in viewvc-httpd on upgrade from 1.0.x
+
 * Tue Mar 30 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.5-1
 - bump up to 1.1.5
 
 * Thu Mar 11 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.4-1
 - bump up to 1.1.4
 
-* Fri Jan  8 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.3-2
+* Tue Feb  2 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.3-1
+- bump up to 1.1.3
 - patch upstream issue #445
 
-* Wed Dec 23 2009 Bojan Smojver <bojan@rexursive.com> - 1.1.3-1
-- bump up to 1.1.3
-- drop patch for upstream issue #427
-
-* Wed Sep 23 2009 Bojan Smojver <bojan@rexursive.com> - 1.1.2-5
-- patch upstream issue #427
-
-* Thu Aug 13 2009 Bojan Smojver <bojan@rexursive.com> - 1.1.2-4
-- try one more time
-
-* Thu Aug 13 2009 Bojan Smojver <bojan@rexursive.com> - 1.1.2-3
-- better mimetypes.conf generation script
-
-* Wed Aug 12 2009 Bojan Smojver <bojan@rexursive.com> - 1.1.2-2
-- fix replacement of various config variables
-
-* Wed Aug 12 2009 Bojan Smojver <bojan@rexursive.com> - 1.1.2-1
-- bump up to 1.1.2
+* Wed Aug 12 2009 Bojan Smojver <bojan@rexursive.com> - 1.0.9-1
+- bump up to 1.0.9
 - security fix: validate the 'view' parameter to avoid XSS attack
 - security fix: avoid printing illegal parameter names and values
 
-* Tue Aug 11 2009 Bojan Smojver <bojan@rexursive.com> - 1.1.1-3
-- install mimetypes.conf
-- populate mimetypes.conf with what pygments understands
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Jun  4 2009 Bojan Smojver <bojan@rexursive.com> - 1.1.1-1
-- Bump up to 1.1.1
-
-* Thu May 14 2009 Bojan Smojver <bojan@rexursive.com> - 1.1.0-1
-- Final 1.1.0
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-0.beta1.1.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 1.1.0-0.beta1.1.1
-- Rebuild for Python 2.6
-
-* Thu Nov  6 2008 Bojan Smojver <bojan@rexursive.com> - 1.1.0-0.beta1.1
-- Rebase to 1.1.x
-
-* Mon Oct 27 2008 Bojan Smojver <bojan@rexursive.com> - 1.0.7-2
-- Depend on webserver to avoid pulling in Apache/mod_python (bug #457691)
-- Provide viewvc-httpd package for mod_python specific configuration
+* Thu May  7 2009 Bojan Smojver <bojan@rexursive.com> - 1.0.8-1
+- Bump up to 1.0.8
 
 * Wed Oct 15 2008 Bojan Smojver <bojan@rexursive.com> - 1.0.7-1
 - Bump up to 1.0.7