- merged /usr/lib/cgi-bin changes from DEVEL

Changed files:
    cvsweb-apache.conf -> 1.4
    cvsweb.spec -> 1.34

diff --git a/cvsweb-apache.conf b/cvsweb-apache.conf
index 7449cd1d34d33611211e99c015c3dd66f0550bed..3c80dd92d42926995926e1a9821770d0cfa39f5d 100644 (file)
--- a/cvsweb-apache.conf
+++ b/cvsweb-apache.conf
@@ -1,11 +1,15 @@
 
-# Version1 (default): under /cgi-bin/cvsweb.cgi address
-ScriptAlias /cgi-bin/cvsweb.cgi /usr/share/cvsweb/cvsweb.cgi
-Alias /cvsweb/css/ /usr/share/cvsweb/css/
-Alias /cvsweb/enscript/ /usr/share/cvsweb/enscript/
-Alias /cvsweb/icons/ /usr/share/cvsweb/icons/
+<Directory /usr/share/cvsweb>
+       AllowOverride None
+       Allow from all
+</Directory>
 
+# Version1 (default): under /cgi-bin/cvsweb.cgi address
+ScriptAlias /cgi-bin/cvsweb.cgi /usr/lib/cgi-bin/cvsweb.cgi
+Alias /cvsweb/ /usr/share/cvsweb/
 <Location /cgi-bin/cvsweb.cgi>
+       Allow from all
+
        # See also $charset in cvsweb.conf.
        #AddDefaultCharset UTF-8
 
@@ -16,23 +20,16 @@ Alias /cvsweb/icons/ /usr/share/cvsweb/icons/
 #              PerlOptions +ParseHeaders
 #              Options ExecCGI
 #      </IfModule>
-
-       Allow from all
-</Location>
-<Location /cvsweb/>
-       Allow from all
 </Location>
 
 # Version 2: cvsweb as handler to whole vhost:
 #<VirtualHost *:80>
-#    ServerName cvs
+#      ServerName cvs
 #
-#    Alias /cvsweb/css/ /usr/share/cvsweb/css/
-#    Alias /cvsweb/enscript/ /usr/share/cvsweb/enscript/
-#    Alias /cvsweb/icons/ /usr/share/cvsweb/icons/
-#    DocumentRoot /usr/share/cvsweb/cvsweb.cgi
-#    <Location />
-#        Options ExecCGI
-#        Allow from all
-#    </Location>
+#      Alias /cvsweb/ /usr/share/cvsweb/
+#      DocumentRoot /usr/lib/cgi-bin/cvsweb.cgi
+#      <Location />
+#              Options ExecCGI
+#              Allow from all
+#      </Location>
 #</VirtualHost>

diff --git a/cvsweb.spec b/cvsweb.spec
index 2a2f8bb23a7327fc84c28b4a2972e5be5c139b0f..70313060c40ee74e9e1e2ac1ebfe2a5a05f66a8c 100644 (file)
--- a/cvsweb.spec
+++ b/cvsweb.spec
@@ -3,7 +3,7 @@ Summary:        Visual (www) interface to explore a CVS repository
 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
@@ -14,7 +14,7 @@ URL:          http://www.freebsd.org/projects/cvsweb.html
 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
@@ -27,6 +27,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %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
@@ -61,10 +62,9 @@ find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v
 
 %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
@@ -141,8 +141,5 @@ fi
 %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}