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

[bojan]

commit a41ed28d2cb7355ee320112e0d61ca71e118473b
Merge: d164e4d 1650126
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Fri Jun 3 10:24:55 2011 +1000

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

 viewvc.spec |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --cc viewvc.spec
index f8d7d3b,dca977b..7283608
--- a/viewvc.spec
+++ b/viewvc.spec
@@@ -2,7 -2,7 +2,7 @@@
  
  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
@@@ -35,8 -35,7 +35,8 @@@ but much more prettily than the averag
  %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
@@@ -117,11 -115,15 +116,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
 +- make spec/conf more like other branches
 +
  * Wed May 18 2011 Bojan Smojver <bojan at rexursive.com> - 1.1.11-1
  - bump up to 1.1.11