Author: glen Date: Sun Jun 19 19:35:54 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- FHS fix: cvsweb.cgi moved to %{_datadir}
---- Files affected:
SPECS:
cvsweb.spec (1.30 -> 1.31)
---- Diffs:
================================================================
Index: SPECS/cvsweb.spec
diff -u SPECS/cvsweb.spec:1.30 SPECS/cvsweb.spec:1.31
--- SPECS/cvsweb.spec:1.30 Sun Jun 19 21:28:58 2005
+++ SPECS/cvsweb.spec Sun Jun 19 21:35:49 2005
@@ -4,7 +4,7 @@
Summary(pl): Wizualny (WWW) interfejs do przeglądania repozytorium CVS
Name: cvsweb
Version: 3.0.5
-Release: 0.20
+Release: 0.22
Epoch: 1
License: BSD
Group: Development/Tools
@@ -26,7 +26,6 @@
%define _sysconfdir /etc/%{name}
%define _appdir %{_datadir}/%{name}
-%define _cgibindir %{_libdir}/cgi-bin
%description
CVSweb is a WWW interface for CVS repositories with which you can
@@ -61,9 +60,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%{_cgibindir}
+install %{name}.cgi $RPM_BUILD_ROOT%{_appdir}
install css/* $RPM_BUILD_ROOT%{_appdir}/css
install enscript/* $RPM_BUILD_ROOT%{_appdir}/enscript
install icons/* $RPM_BUILD_ROOT%{_appdir}/icons
@@ -72,23 +71,30 @@
echo '# vim:syn=perl' >> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
cat <<EOF > $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-Alias /%{name}/ %{_appdir}/
-ScriptAlias /cgi-bin/%{name}.cgi %{_cgibindir}/%{name}.cgi
+Alias /%{name}/css/ %{_appdir}/css/
+Alias /%{name}/enscript/ %{_appdir}/enscript/
+Alias /%{name}/icons/ %{_appdir}/icons/
+ScriptAlias /cgi-bin/%{name}.cgi %{_appdir}/%{name}.cgi
+
+<Location /cgi-bin/%{name}.cgi>
+ # See also $charset in cvsweb.conf.
+ #AddDefaultCharset UTF-8
+
+ # mod_perl >= 1.99:
+ <IfModule mod_perl.c>
+ SetHandler perl-script
+ PerlResponseHandler ModPerl::Registry
+ PerlOptions +ParseHeaders
+ Options ExecCGI
+ </IfModule>
-<Location /cgi-bin/cvsweb.cgi>
- # See also $charset in cvsweb.conf.
- #AddDefaultCharset UTF-8
-
- # mod_perl >= 1.99:
- <IfModule mod_perl.c>
- SetHandler perl-script
- PerlResponseHandler ModPerl::Registry
- PerlOptions +ParseHeaders
- Options ExecCGI
- </IfModule>
+ Allow from all
+</Location>
+<Location /%{name}/>
+ Allow from all
</Location>
-# vim: filetype=apache ts=4 sw=4 et
+# vim: filetype=apache ts=4 sw=4
EOF
%post
@@ -133,8 +139,6 @@
# apache1
if [ -d /etc/apache/conf.d ]; then
rm -f /etc/apache/conf.d/09_%{name}.conf # old slot
- rm -f /etc/apache/conf.d/41_%{name}.conf # old slot
- rm -f /etc/apache/conf.d/61_%{name}.conf # old slot
ln -sf %{_sysconfdir}/apache.conf /etc/apache/conf.d/79_%{name}.conf
if [ -f /var/lock/subsys/apache ]; then
/etc/rc.d/init.d/apache restart 1>&2
@@ -154,8 +158,11 @@
%dir %attr(750,root,http) %{_sysconfdir}
%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
-%attr(755,root,root) %{_cgibindir}/cvsweb.cgi
-%{_datadir}/%{name}
+%dir %{_appdir}
+%{_appdir}/css
+%{_appdir}/enscript
+%{_appdir}/icons
+%attr(755,root,root) %{_appdir}/cvsweb.cgi
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -163,6 +170,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.31 2005/06/19 19:35:49 glen
+- FHS fix: cvsweb.cgi moved to %{_datadir}
+
Revision 1.30 2005/06/19 19:28:58 glen
- playing with the config slots
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/cvsweb.spec?r1=1.30&r2=1.31&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
