SPECS: viewvc.spec - cgi and mod_python subpackages released

[twittner]

Author: twittner                     Date: Sun Oct  1 13:41:40 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cgi and mod_python subpackages released

---- Files affected:
SPECS:
   viewvc.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/viewvc.spec
diff -u SPECS/viewvc.spec:1.4 SPECS/viewvc.spec:1.5
--- SPECS/viewvc.spec:1.4	Sun Oct  1 14:37:04 2006
+++ SPECS/viewvc.spec	Sun Oct  1 15:41:35 2006
@@ -1,13 +1,9 @@
 # $Revision$, $Date$
-#
-# TODO:	- release cgi, mod_python and, mayby admin part in subpackages
-#	- mod_python configuration example in apache configuration snippet
-#
 Summary:	Browser interface for CVS and subversion version control repositories
 #Summary(pl):
 Name:		viewvc
 Version:	1.0.2
-Release:	0.1
+Release:	0.2
 License:	distributable
 Group:		Applications/WWW
 Source0:	http://viewvc.tigris.org/files/documents/3330/34450/%{name}-%{version}.tar.gz
@@ -16,14 +12,6 @@
 BuildRequires:	python-modules
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	webapps
-%if %{with trigger}
-Requires(triggerpostun):	sed >= 4.0
-%endif
-#Requires:	webserver(access)
-#Requires:	webserver(alias)
-#Requires:	webserver(auth)
-#Requires:	webserver(cgi)
-#Requires:	webserver(indexfile)
 Obsoletes:	viewcvs
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -61,8 +49,28 @@
 - INI-like configuration file (as opposed to requiring actual code
   tweaks).
 
+In order to run viewvc you must install viewvc-cgi or viewvc-mod_python package.
+
 #%%description -l pl
 
+%package cgi
+Summary:	ViewVC - cgi interface
+Group:		Applications/WWW
+Requires:	%{name} = %{version}-%{release}
+Requires:	webserver(cgi)
+
+%description cgi
+ViewVC - cgi interface.
+
+%package mod_python 
+Summary:	ViewVC - mod_python interface
+Group:		Applications/WWW
+Requires:	%{name} = %{version}-%{release}
+Requires:	apache-mod_python
+
+%description mod_python
+ViewVC - mod_python interface.
+
 %prep
 %setup -q
 
@@ -119,12 +127,6 @@
 ln -sf %{_sysconfdir}/cvsgraph.conf $RPM_BUILD_ROOT%{_appdir}/cvsgraph.conf
 ln -sf %{_sysconfdir}/viewvc.conf $RPM_BUILD_ROOT%{_appdir}/viewvc.conf
 
-# %webapp_* macros usage extracted from %{_prefix}/lib/rpm/macros.build:
-#
-# Usage:
-#   %%webapp_register HTTPD WEBAPP
-#   %%webapp_unregister HTTPD WEBAPP
-
 %triggerin -- apache1 < 1.3.37-3, apache1-base
 %webapp_register apache %{_webapp}
 
@@ -157,13 +159,6 @@
 #%%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/lighttpd.conf
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
 %dir %{_appdir}/bin
-%dir %{_appdir}/bin/cgi
-%attr(750,root,http) %{_appdir}/bin/cgi/viewvc.cgi
-%attr(750,root,http) %{_appdir}/bin/cgi/query.cgi
-%dir %{_appdir}/bin/mod_python
-%{_appdir}/bin/mod_python/viewvc.py
-%{_appdir}/bin/mod_python/query.py
-%{_appdir}/bin/mod_python/handler.py
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_appdir}/bin/mod_python/.htaccess
 %attr(750,root,http) %{_appdir}/bin/standalone.py
 %attr(750,root,http) %{_appdir}/bin/loginfo-handler
@@ -263,12 +258,28 @@
 %{_appdir}/templates/roots.ezt
 %{_appdir}/templates/rss.ezt
 
+%files cgi
+%defattr(644,root,root,755)
+%dir %{_appdir}/bin/cgi
+%attr(750,root,http) %{_appdir}/bin/cgi/viewvc.cgi
+%attr(750,root,http) %{_appdir}/bin/cgi/query.cgi
+
+%files mod_python
+%defattr(644,root,root,755)
+%dir %{_appdir}/bin/mod_python
+%{_appdir}/bin/mod_python/viewvc.py
+%{_appdir}/bin/mod_python/query.py
+%{_appdir}/bin/mod_python/handler.py
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/10/01 13:41:35  twittner
+- cgi and mod_python subpackages released
+
 Revision 1.4  2006/10/01 12:37:04  glen
 - cleanups
 - don't trigger on lighttpd as there's no config
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/viewvc.spec?r1=1.4&r2=1.5&f=u