SPECS: cvsweb.spec - merged /usr/lib/cgi-bin changes from DEVEL

[glen]

Author: glen                         Date: Mon Jan  9 23:42:35 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged /usr/lib/cgi-bin changes from DEVEL

---- Files affected:
SPECS:
   cvsweb.spec (1.33 -> 1.34) 

---- Diffs:

================================================================
Index: SPECS/cvsweb.spec
diff -u SPECS/cvsweb.spec:1.33 SPECS/cvsweb.spec:1.34
--- SPECS/cvsweb.spec:1.33	Tue Jan 10 00:33:05 2006
+++ SPECS/cvsweb.spec	Tue Jan 10 00:42:29 2006
@@ -4,7 +4,7 @@
 Summary(pl):	Wizualny (WWW) interfejs do przeglądania repozytorium CVS
 Name:		cvsweb
 Version:	3.0.6
-Release:	0.4
+Release:	0.6
 Epoch:		1
 License:	BSD
 Group:		Development/Tools
@@ -15,7 +15,7 @@
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-emptyscript.patch
 BuildRequires:	rpmbuild(macros) >= 1.268
-# for %{_libdir}/cgi-bin
+# for %{_prefix}/lib/cgi-bin
 Requires:	FHS >= 2.3-8
 Requires:	rcs
 # for /etc/mime.types
@@ -28,6 +28,7 @@
 %define		_webapp		%{name}
 %define		_sysconfdir	%{_webapps}/%{_webapp}
 %define		_appdir		%{_datadir}/%{name}
+%define		_cgibindir	%{_prefix}/lib/cgi-bin
 
 %description
 CVSweb is a WWW interface for CVS repositories with which you can
@@ -62,10 +63,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_appdir}/{css,enscript,icons},%{_cgibindir},%{_sysconfdir}}
 
-install -d $RPM_BUILD_ROOT{%{_appdir}/{css,enscript,icons},%{_sysconfdir}}
-
-install %{name}.cgi	$RPM_BUILD_ROOT%{_appdir}
+install %{name}.cgi	$RPM_BUILD_ROOT%{_cgibindir}
 install css/*		$RPM_BUILD_ROOT%{_appdir}/css
 install enscript/*	$RPM_BUILD_ROOT%{_appdir}/enscript
 install icons/*		$RPM_BUILD_ROOT%{_appdir}/icons
@@ -142,11 +142,8 @@
 %config(noreplace) %verify(not md5 mtime size) %attr(640,root,http) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %verify(not md5 mtime size) %attr(640,root,root) %{_sysconfdir}/apache.conf
 %config(noreplace) %verify(not md5 mtime size) %attr(640,root,root) %{_sysconfdir}/httpd.conf
-%dir %{_appdir}
-%{_appdir}/css
-%{_appdir}/enscript
-%{_appdir}/icons
-%attr(755,root,root) %{_appdir}/cvsweb.cgi
+%attr(755,root,root) %{_cgibindir}/cvsweb.cgi
+%{_appdir}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -154,6 +151,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2006/01/09 23:42:29  glen
+- merged /usr/lib/cgi-bin changes from DEVEL
+
 Revision 1.33  2006/01/09 23:33:05  glen
 - apache config moved to SOURCES
 - add patch to allow cvsweb.cgi being used as handler for whole vhost
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cvsweb.spec?r1=1.33&r2=1.34&f=u