[packages/viewvc] apache conf compatible with apache 1.3-2.4

[glen]

commit 60aacd597acd7363288c60fafa0b2d8f057be30c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed May 13 22:46:15 2015 +0300

    apache conf compatible with apache 1.3-2.4

 apache.conf       | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 viewvc-httpd.conf | 34 --------------------------------
 viewvc.spec       |  6 +++---
 3 files changed, 62 insertions(+), 37 deletions(-)
---
diff --git a/viewvc.spec b/viewvc.spec
index 2f52105..e57f474 100644
--- a/viewvc.spec
+++ b/viewvc.spec
@@ -10,7 +10,7 @@ License:	BSD
 Group:		Applications/WWW
 Source0:	http://www.viewvc.org/%{name}-%{version}.tar.gz
 # Source0-md5:	13292307114b0f4bb4fc322597ec8007
-Source1:	%{name}-httpd.conf
+Source1:	apache.conf
 URL:		http://www.viewvc.org/
 BuildRequires:	python
 BuildRequires:	python-modules
@@ -166,8 +166,8 @@ ViewVC - szablon viewsvn
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_webapps}/%{_webapp},%{_appdir},%{_sysconfdir}}
 
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
 #install lighttpd.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/lighttpd.conf
 
 ./viewvc-install --destdir=$RPM_BUILD_ROOT --prefix=%{_appdir}
diff --git a/apache.conf b/apache.conf
new file mode 100644
index 0000000..f4da2c9
--- /dev/null
+++ b/apache.conf
@@ -0,0 +1,59 @@
+<Directory /usr/share/viewvc>
+	AllowOverride None
+	Options +FollowSymlinks
+
+	# Apache 1.3, 2.x
+	<IfModule !mod_authz_core.c>
+		Order allow,deny
+		Allow from all
+	</IfModule>
+	# Apache 2.4
+	<IfModule mod_authz_core.c>
+		Require all granted
+	</IfModule>
+</Directory>
+
+# Version1 (default): under /cgi-bin/viewvc.cgi address
+ScriptAlias /cgi-bin/viewvc.cgi /usr/share/viewvc/bin/cgi/viewvc.cgi
+ScriptAlias /cgi-bin/viewvc-query.cgi /usr/share/viewvc/bin/cgi/query.cgi
+
+# if using apache2 mod_python:
+# Alias /viewvc	/usr/share/viewvc/bin/mod_python
+# <Location /viewvc>
+#	# Apache 1.3, 2.x
+#	<IfModule !mod_authz_core.c>
+#		Order allow,deny
+#		Allow from all
+#	</IfModule>
+#	# Apache 2.4
+#	<IfModule mod_authz_core.c>
+#		Require all granted
+#	</IfModule>
+#	<IfModule mod_python.c>
+#		AddHandler mod_python .py
+#		PythonPath "sys.path+['/usr/share/viewvc/bin/mod_python']"
+#		PythonHandler handler
+#		PythonDebug Off
+#	</IfModule>
+# </Location>
+
+# Version 2: viewvc as handler to whole vhost:
+#<VirtualHost *:80>
+#	ServerName cvs
+#
+#	Alias /viewvc/ /usr/share/viewvc
+#	DocumentRoot /usr/share/viewvc/bin/cgi/viewvc.cgi
+#	<Location />
+#		Options ExecCGI
+#		# Apache 1.3, 2.x
+#		<IfModule !mod_authz_core.c>
+#			Order allow,deny
+#			Allow from all
+#		</IfModule>
+#		# Apache 2.4
+#		<IfModule mod_authz_core.c>
+#			Require all granted
+#		</IfModule>
+#	</Location>
+#</VirtualHost>
+
diff --git a/viewvc-httpd.conf b/viewvc-httpd.conf
deleted file mode 100644
index 7e3de1a..0000000
--- a/viewvc-httpd.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-<Directory /usr/share/viewvc>
-    AllowOverride None
-    Options +FollowSymlinks
-    Allow from all
-</Directory>
-
-# Version1 (default): under /cgi-bin/viewvc.cgi address
-ScriptAlias /cgi-bin/viewvc.cgi /usr/share/viewvc/bin/cgi/viewvc.cgi
-ScriptAlias /cgi-bin/viewvc-query.cgi /usr/share/viewvc/bin/cgi/query.cgi
-
-# if using apache2 mod_python:
-# Alias /viewvc	/usr/share/viewvc/bin/mod_python
-# <Location /viewvc>
-#    Allow from all
-#	<IfModule mod_python.c>
-#		AddHandler mod_python .py
-#		PythonPath "sys.path+['/usr/share/viewvc/bin/mod_python']"
-#		PythonHandler handler
-#		PythonDebug Off
-#	</IfModule>
-# </Location>
-
-# Version 2: viewvc as handler to whole vhost:
-#<VirtualHost *:80>
-#   ServerName cvs
-#
-#   Alias /viewvc/ /usr/share/viewvc
-#   DocumentRoot /usr/share/viewvc/bin/cgi/viewvc.cgi
-#   <Location />
-#       Options ExecCGI
-#       Allow from all
-#   </Location>
-#</VirtualHost>
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/viewvc.git/commitdiff/60aacd597acd7363288c60fafa0b2d8f057be30c