rpms/cvsweb/devel cvsweb-3.0.6-fedora-config.patch, 1.1, 1.2 cvsweb.spec, 1.9, 1.10

[Lubomir Rintel (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/cvsweb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7822

Modified Files:
	cvsweb-3.0.6-fedora-config.patch cvsweb.spec 
Log Message:
* Sat Jun 21 2008 Lubomir Rintel <lkundrak at v3.sk> - 3.0.6-4
- Move it out of /var/www
- Correct the httpd configuration


cvsweb-3.0.6-fedora-config.patch:

Index: cvsweb-3.0.6-fedora-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cvsweb/devel/cvsweb-3.0.6-fedora-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cvsweb-3.0.6-fedora-config.patch	8 Jan 2006 22:55:34 -0000	1.1
+++ cvsweb-3.0.6-fedora-config.patch	26 Jun 2008 08:37:40 -0000	1.2
@@ -29,6 +29,15 @@
       graph   => [('[GRAPH]',  "$iconsdir/minigraph.png", 16,   16)],
  );
  undef $iconsdir;
+@@ -240,7 +240,7 @@
+ 
+ # An URL where to find the CSS.
+ #
+-$cssurl = '/css/cvsweb.css';
++$cssurl = '/cvsweb/cvsweb.css';
+ 
+ # The length to which the last log entry should be truncated when shown
+ # in the directory view.
 @@ -368,7 +368,7 @@
  # The traditional mime.types file, eg. the one from Apache is fine.
  # See above where this gets used.


Index: cvsweb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvsweb/devel/cvsweb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cvsweb.spec	15 Sep 2006 15:20:07 -0000	1.9
+++ cvsweb.spec	26 Jun 2008 08:37:40 -0000	1.10
@@ -1,13 +1,15 @@
 Name:           cvsweb
 Version:        3.0.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Web interface for CVS repositories
 
 License:        BSD
 Group:          Development/Tools
 URL:            http://www.freebsd.org/projects/cvsweb.html
 Source0:        http://people.freebsd.org/~scop/cvsweb/%{name}-%{version}.tar.gz
+Source1:        cvsweb.conf
 Patch0:         %{name}-3.0.6-fedora-config.patch
+Patch1:         %{name}-3.0.6-perl-x.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -25,6 +27,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -33,15 +36,16 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -Dpm 755 cvsweb.cgi \
-  $RPM_BUILD_ROOT%{_localstatedir}/www/cgi-bin/cvsweb.cgi
+  $RPM_BUILD_ROOT%{_datadir}/cvsweb/cvsweb.cgi
 install -Dpm 644 css/cvsweb.css \
-  $RPM_BUILD_ROOT%{_localstatedir}/www/html/css/cvsweb.css
+  $RPM_BUILD_ROOT%{_datadir}/cvsweb/cvsweb.css
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/cvsweb/conf.d
 install -pm 644 cvsweb.conf $RPM_BUILD_ROOT%{_sysconfdir}/cvsweb
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/enscript/hl
 install -pm 644 enscript/lang_cvsweb*.st $RPM_BUILD_ROOT%{_datadir}/enscript/hl
 install -Dpm 644 icons/minigraph.png \
   $RPM_BUILD_ROOT%{_localstatedir}/www/icons/small/minigraph.png
+install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/cvsweb.conf
 
 
 %clean
@@ -50,15 +54,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog NEWS README TODO INSTALL samples/cvsweb-httpd.conf
+%doc ChangeLog NEWS README TODO INSTALL
 %config(noreplace) %{_sysconfdir}/cvsweb/
-%{_localstatedir}/www/cgi-bin/cvsweb.cgi
-%{_localstatedir}/www/html/css/
+%{_datadir}/cvsweb
+%{_datadir}/enscript
+%{_sysconfdir}/httpd/conf.d/cvsweb.conf
 %{_localstatedir}/www/icons/small/minigraph.png
-%{_datadir}/enscript/
 
 
 %changelog
+* Sat Jun 21 2008 Lubomir Rintel <lkundrak at v3.sk> - 3.0.6-4
+- Move it out of /var/www
+- Correct the httpd configuration
+
 * Fri Sep 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.0.6-3
 - Rebuild.