[viewvc/el4: 2/2] Merge branch 'master' into el4

[bojan]

commit 6324a162882440b53f08ebaf1910453333f2e880
Merge: d5ec749 1650126
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Fri Jun 3 10:31:51 2011 +1000

    Merge branch 'master' into el4
    
    Conflicts:
    	viewvc.spec

 viewvc.spec |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --cc viewvc.spec
index 631f411,dca977b..a6b87fa
--- a/viewvc.spec
+++ b/viewvc.spec
@@@ -1,16 -1,8 +1,16 @@@
  %{!?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.11
--Release:        2%{?dist}
++Release:        3%{?dist}
  Summary:        Browser interface for CVS and SVN version control repositories
  
  Group:          Development/Tools
@@@ -27,10 -19,8 +27,10 @@@ Conflicts:      selinux-policy < 2.5.10
  
  BuildArch:      noarch
  BuildRequires:  python-devel >= 2.0, python-pygments
- Requires:       webserver, rcs, diffutils
+ Requires:       rcs, diffutils
 +%if 0%{with_subversion}
  Requires:       subversion >= 1.2
 +%endif
  Requires:       cvsgraph
  Requires:       python-pygments
  
@@@ -49,8 -35,7 +49,8 @@@ This version only supports CVS reposito
  %package httpd
  Summary:        ViewVC configuration for Apache/mod_python
  Group:          Development/Tools
- Requires:       %{name} = %{version}-%{release}, mod_python
+ 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
@@@ -131,11 -115,15 +130,18 @@@ with decent performance when run under 
  %files httpd
  %defattr(-, root, root, -)
  %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
+ %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc
  
  %changelog
 -* Wed Jun  1 2011 Bojan Smojver <bojan at rexursive.com> - 1.1.11-2
++* Wed Jun  1 2011 Bojan Smojver <bojan at 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 at rexursive.com> - 1.1.11-2
 +- remove duplicate conf section
 +
  * Wed May 18 2011 Bojan Smojver <bojan at rexursive.com> - 1.1.11-1
  - bump up to 1.1.11