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

---
 cgit-apache.conf | 23 +++++++++++++++++++++++
 cgit.spec        | 12 +++++++-----
 2 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 cgit-apache.conf

diff --git a/cgit-apache.conf b/cgit-apache.conf
new file mode 100644
index 0000000..cc0b45a
--- /dev/null
+++ b/cgit-apache.conf
@@ -0,0 +1,23 @@
+<Directory /usr/share/cgit>
+	AllowOverride None
+	Allow from All
+</Directory>
+
+# Version 1 (default): under /cgi-bin/cgit.cgi address
+ScriptAlias /cgi-bin/cgit.cgi /usr/lib/cgi-bin/cgit.cgi
+Alias /cgit/ /usr/share/cgit/
+<Location /cgi-bin/cgit.cgi>
+	Allow from All
+</Location>
+
+# Version 2: cgit as a handler to whole vhost:
+#<VirtualHost *:80>
+#	ServerName cgit
+#
+#	Alias /cgit/ /usr/share/cgit/
+#	DocumentRoot /usr/lib/cgi-bin/cgit.cgi
+#	<Location />
+#		Options ExecCGI
+#		Allow from All
+#	</Location>
+#</VirtualHost>
diff --git a/cgit.spec b/cgit.spec
index 74abf0f..0075933 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -6,14 +6,15 @@ Summary:	cgit - a fast webinterface to git
 Summary(pl.UTF-8):	cgit - szybki interfejs WWW do gita
 Name:		cgit
 Version:	0.8.3.4
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://hjemli.net/git/cgit/snapshot/%{name}-%{version}.tar.bz2
 # Source0-md5:	712e4d3013d754aa5752e0101188cf32
 Source1:	%{name}.conf
 Source2:	%{name}-repo.conf
-Source3:	%{name}-httpd.conf
+Source3:	%{name}-apache.conf
+Source4:	%{name}-httpd.conf
 Patch0:		%{name}-system-git.patch
 Patch1:		%{name}-override-cflags.patch
 URL:		http://hjemli.net/git/cgit
@@ -21,6 +22,7 @@ BuildRequires:	git-core-devel >= 1.7.3
 BuildRequires:	openssl-devel
 BuildConflicts:	zlib-devel = 1.2.5-1
 Requires:	webapps
+Conflicts:	apache-base < 2.4.0-1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		webapp		cgit
@@ -75,7 +77,7 @@ install -d $RPM_BUILD_ROOT%{webappdir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{webappdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{webappdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{webappdir}/apache.conf
-install %{SOURCE3} $RPM_BUILD_ROOT%{webappdir}/httpd.conf
+install %{SOURCE4} $RPM_BUILD_ROOT%{webappdir}/httpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -86,10 +88,10 @@ rm -rf $RPM_BUILD_ROOT
 %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}
 
 %files
-- 
2.44.0