From 37220c63cbcd2e89385241708d2692b86fcfeea4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Wed, 15 May 2013 18:32:25 +0200
Subject: [PATCH] - migrate to apache 2.4 - rel 7

---
 cvsweb-httpd.conf | 36 ++++++++++++++++++++++++++++++++++++
 cvsweb.spec       | 11 ++++++-----
 2 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 cvsweb-httpd.conf

diff --git a/cvsweb-httpd.conf b/cvsweb-httpd.conf
new file mode 100644
index 0000000..1c9ac8b
--- /dev/null
+++ b/cvsweb-httpd.conf
@@ -0,0 +1,36 @@
+
+<Directory /usr/share/cvsweb>
+	AllowOverride None
+	Require all granted
+</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>
+	Require all granted
+
+	# See also $charset in cvsweb.conf.
+	#AddDefaultCharset UTF-8
+
+	# if using apache2 mod_perl:
+#	<IfModule mod_perl.c>
+#		SetHandler perl-script
+#		PerlResponseHandler ModPerl::Registry
+#		PerlOptions +ParseHeaders
+#		Options ExecCGI
+#	</IfModule>
+</Location>
+
+# Version 2: cvsweb as handler to whole vhost:
+#<VirtualHost *:80>
+#	ServerName cvs
+#
+#	Alias /cvsweb/ /usr/share/cvsweb/
+#	DocumentRoot /usr/lib/cgi-bin/cvsweb.cgi
+#	<Location />
+#		Options ExecCGI
+#		Require all granted
+#	</Location>
+#</VirtualHost>
diff --git a/cvsweb.spec b/cvsweb.spec
index 5c6ee8c..eb409b0 100644
--- a/cvsweb.spec
+++ b/cvsweb.spec
@@ -3,13 +3,14 @@ Summary:	Visual (www) interface to explore a CVS repository
 Summary(pl.UTF-8):	Wizualny (WWW) interfejs do przeglądania repozytorium CVS
 Name:		cvsweb
 Version:	3.0.6
-Release:	6
+Release:	7
 Epoch:		1
 License:	BSD
 Group:		Development/Tools
 Source0:	http://people.FreeBSD.org/~scop/cvsweb/%{name}-%{version}.tar.gz
 # Source0-md5:	0e1eec962b1db00e01b295fff84b6e89
 Source1:	%{name}-apache.conf
+Source2:	%{name}-httpd.conf
 URL:		http://www.freebsd.org/projects/cvsweb.html
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-emptyscript.patch
@@ -23,7 +24,7 @@ Requires:	filesystem >= 3.0-11
 Requires:	mailcap
 Requires:	rcs
 Requires:	webapps
-Conflicts:	apache-base < 2.2.0-8
+Conflicts:	apache-base < 2.4.0-1
 Conflicts:	apache1 < 1.3.34-6
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -92,7 +93,7 @@ install icons/*		$RPM_BUILD_ROOT%{_appdir}/icons
 install %{name}.conf	$RPM_BUILD_ROOT%{_sysconfdir}
 echo '# vim:syn=perl' >> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -110,10 +111,10 @@ fi
 %triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- %{name} < 1:3.0.6-0.2
-- 
2.43.0