rpms/viewvc/devel README.httpd,NONE,1.1 viewvc.spec,1.11,1.12

[Bojan Smojver]

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25466

Modified Files:
	viewvc.spec 
Added Files:
	README.httpd 
Log Message:
Depend on webserver to avoid pulling in Apache/mod_python (bug #457691).
Provide viewvc-httpd package for mod_python specific configuration.


--- NEW FILE README.httpd ---
In order to run ViewVC under Apache and mod_python, you must install
viewvc-httpd package.


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/viewvc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- viewvc.spec	14 Oct 2008 23:41:22 -0000	1.11
+++ viewvc.spec	26 Oct 2008 23:50:36 -0000	1.12
@@ -17,7 +17,7 @@
 
 Name:           viewvc
 Version:        1.0.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -25,6 +25,7 @@
 URL:            http://www.viewvc.org/
 Source0:        http://www.viewvc.org/%{name}-%{version}.tar.gz
 Source1:        viewvc.conf
+Source2:        README.httpd
 Patch0:         viewvc-temp-location.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,7 +34,7 @@
 
 BuildArch:      noarch
 BuildRequires:  python-devel >= 2.0
-Requires:       mod_python, rcs, diffutils
+Requires:       webserver, rcs, diffutils
 %if 0%{with_subversion}
 Requires:       subversion >= 1.2
 %endif
@@ -53,6 +54,15 @@
 This version only supports CVS repositories.
 %endif
 
+%package httpd
+Summary:        ViewVC configuration for Apache/mod_python
+Group:          Development/Tools
+Requires:       %{name} = %{version}-%{release}, mod_python
+
+%description httpd
+ViewVC configuration for Apache/mod_python. This package should provide ViewVC
+with decent performance when run under Apache.
+
 %prep
 %setup -q
 %patch0 -p0 -b .temp-location
@@ -101,10 +111,11 @@
 %{__install} -Dp -m0644 %{buildroot}%{python_sitelib}/viewvc/cvsgraph.conf %{buildroot}%{_sysconfdir}/viewvc/cvsgraph.conf
 %{__rm} -f %{buildroot}%{python_sitelib}/viewvc/cvsgraph.conf
 
-# Install Apache configuration
+# Install Apache configuration and README
 %{__sed} -e s,__datadir__,%{_datadir}, \
          -e s,__python_sitelib__,%{python_sitelib}, %{SOURCE1} > viewvc.conf
 %{__install} -Dp -m0644 viewvc.conf %{buildroot}/etc/httpd/conf.d/viewvc.conf
+%{__cp} %{SOURCE2} README.httpd
 
 # mod_python files mustn't be executable since they don't have shebang
 # make rpmlint happy!
@@ -125,14 +136,21 @@
 
 %files
 %defattr(-, root, root, -)
-%doc CHANGES README INSTALL TODO COMMITTERS LICENSE.html docs
+%doc CHANGES README README.httpd INSTALL TODO COMMITTERS LICENSE.html docs
 %config(noreplace) %{_sysconfdir}/viewvc
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 %{python_sitelib}/*
 %{_datadir}/*
 %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc
 
+%files httpd
+%defattr(-, root, root, -)
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
+
 %changelog
+* Mon Oct 27 2008 Bojan Smojver <bojan at 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
+
 * Wed Oct 15 2008 Bojan Smojver <bojan at rexursive.com> - 1.0.7-1
 - Bump up to 1.0.7