SPECS: man.spec - fixed man2html-cgi, mainly paths: added -cgi_pat...

[twittner]

Author: twittner                     Date: Sat Jul  9 07:55:57 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed man2html-cgi, mainly paths: added -cgi_paths.patch, moved
  /home/http/cgi-bin/man -> /usr/lib/cgi-bin/man
  /home/http/cgi-aux/man -> /usr/share/man2html-cgi
- added configuration and triggers for apaches
- req: FHS >= 2.3-12
- rel. 2

---- Files affected:
SPECS:
   man.spec (1.100 -> 1.101) 

---- Diffs:

================================================================
Index: SPECS/man.spec
diff -u SPECS/man.spec:1.100 SPECS/man.spec:1.101
--- SPECS/man.spec:1.100	Fri Mar 11 09:50:34 2005
+++ SPECS/man.spec	Sat Jul  9 09:55:51 2005
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-# TODO:
-# - move http/cgi files to /usr/....
-#
 Summary:	Manual page reader
 Summary(de):	Manual-Page-Reader
 Summary(es):	Lector de páginas de manual (man)
@@ -14,7 +11,7 @@
 Summary(uk):	îÁÂŚŇ ŐÔÉĚŚÔ ÄĚŃ ÄĎËŐÍĹÎÔÁĂŚ§: man, apropos ÔÁ whatis
 Name:		man
 Version:	1.5p
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	ftp://ftp.win.tue.nl/pub/linux-local/utils/man/%{name}-%{version}.tar.gz
@@ -38,6 +35,7 @@
 Patch12:	%{name}-pmake.patch
 Patch13:	%{name}-fmntbug.patch
 Patch14:	%{name}-awk_path.patch
+Patch15:	%{name}-cgi_paths.patch
 BuildRequires:	less
 Requires(post,preun):	fileutils
 Requires:	%{name}-config = %{version}-%{release}
@@ -46,6 +44,7 @@
 Requires:	gzip
 Requires:	less
 Requires:	mktemp >= 1.5-8
+Requires:	FHS >= 2.3-12
 Obsoletes:	man-cs
 Obsoletes:	man-da
 Obsoletes:	man-de
@@ -58,9 +57,8 @@
 Obsoletes:	man-sl
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_servdir	/home/services
-%define		_httpdir	%{_servdir}/httpd
-%define		_cgidir		%{_httpdir}/cgi-bin
+%define		_cgibinmandir		/usr/lib/cgi-bin/man
+%define		_cgiauxmandir		/usr/share/man2html-cgi
 
 %description
 The man package includes three tools for finding information and/or
@@ -182,6 +180,7 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 # use gzip (not bzip2) to compress formatted man pages
 sed -i -e 's/compress=$/compress=gzip/' configure
@@ -199,8 +198,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/cron.{daily,weekly},%{_bindir},%{_mandir},%{_sbindir},%{_servdir}} \
-	$RPM_BUILD_ROOT%{_mandir}/{hu,ja,ko}/man{1,5,8}
+install -d $RPM_BUILD_ROOT{/etc/cron.{daily,weekly},%{_bindir},%{_mandir},%{_sbindir},%{_cgibinmandir},%{_cgiauxmandir}} \
+	$RPM_BUILD_ROOT{%{_mandir}/{hu,ja,ko}/man{1,5,8},%{_sysconfdir}/man}
 
 echo '%defattr(644,root,root,755)' > man.lang
 for i in "" bg cs da de el es fi fr hr hu id it ja ko nl pl pt pt_BR ro ru \
@@ -240,8 +239,9 @@
 install man/pl/man1/man2html.1 $RPM_BUILD_ROOT%{_mandir}/pl/man1
 install man/ro/man2html.man $RPM_BUILD_ROOT%{_mandir}/ro/man1/man2html.1
 
-# Play with /home/services
-mv $RPM_BUILD_ROOT/home/httpd $RPM_BUILD_ROOT%{_servdir}
+cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/man/apache-man2html-cgi.conf
+ScriptAlias /cgi-bin/man %{_cgibinmandir}
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -268,6 +268,18 @@
 rm -f /var/cache/man/X11R6/??/cat[123456789n]/*
 rm -f /var/cache/man/X11R6/??_??/cat[123456789n]/*
 
+%triggerin -n man2html-cgi -- apache1 >= 1.3.33-2
+%apache_config_install -v 1 -c %{_sysconfdir}/man/apache-man2html-cgi.conf -n 09
+
+%triggerun -n man2html-cgi -- apache1 >= 1.3.33-2
+%apache_config_uninstall -v 1 -n 09
+
+%triggerin -n man2html-cgi -- apache >= 2.0.0
+%apache_config_install -v 2 -c %{_sysconfdir}/man/apache-man2html-cgi.conf -n 09
+
+%triggerun -n man2html-cgi -- apache >= 2.0.0
+%apache_config_uninstall -v 2 -n 09
+
 %files -f man.lang
 %defattr(644,root,root,755)
 %doc HISTORY README TODO
@@ -359,15 +371,16 @@
 %files -n man2html-cgi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/hman
-%attr(755,root,root) %{_cgidir}/man
-%{_httpdir}/cgi-aux/man
+%dir %{_cgibinmandir}
+%attr(755,root,root) %{_cgibinmandir}/*
+%{_cgiauxmandir}
 %dir %attr(775,root,http) /var/cache/man2html
 /var/cache/man2html/.glimpse_filters
 %{_mandir}/man1/hman.1*
 %lang(el) %{_mandir}/el/man1/hman.1*
 %lang(ja) %{_mandir}/ja/man1/hman.1*
 # it seems to be the only package using this dir
-%dir %{_httpdir}/cgi-aux
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/man/apache-man2html-cgi.conf
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -375,6 +388,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.101  2005/07/09 07:55:51  twittner
+- fixed man2html-cgi, mainly paths: added -cgi_paths.patch, moved
+  /home/http/cgi-bin/man -> /usr/lib/cgi-bin/man
+  /home/http/cgi-aux/man -> /usr/share/man2html-cgi
+- added configuration and triggers for apaches
+- req: FHS >= 2.3-12
+- rel. 2
+
 Revision 1.100  2005/03/11 08:50:34  qboosh
 - bzip2 no longer Red
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/man.spec?r1=1.100&r2=1.101&f=u