[packages/viewvc] Revert "- migrated to apache 2.4"

[glen]

commit e0acb709104b4656c8a7915e42f277e40e74761e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed May 13 22:42:29 2015 +0300

    Revert "- migrated to apache 2.4"
    
    This reverts commit 1805023c170378b1707e1246e812b6f0a530e1cf.

 viewvc-apache.conf | 34 ----------------------------------
 viewvc-httpd.conf  |  6 +++---
 viewvc.spec        | 12 +++++-------
 3 files changed, 8 insertions(+), 44 deletions(-)
---
diff --git a/viewvc.spec b/viewvc.spec
index 8611c11..2f52105 100644
--- a/viewvc.spec
+++ b/viewvc.spec
@@ -5,13 +5,12 @@ Summary:	Browser interface for CVS and Subversion version control repositories
 Summary(pl.UTF-8):	Interfejs przeglądarki do repozytoriów systemów kontroli wersji CVS i Subversion
 Name:		viewvc
 Version:	1.1.9
-Release:	2
+Release:	1
 License:	BSD
 Group:		Applications/WWW
 Source0:	http://www.viewvc.org/%{name}-%{version}.tar.gz
 # Source0-md5:	13292307114b0f4bb4fc322597ec8007
-Source1:	%{name}-apache.conf
-Source2:	%{name}-httpd.conf
+Source1:	%{name}-httpd.conf
 URL:		http://www.viewvc.org/
 BuildRequires:	python
 BuildRequires:	python-modules
@@ -20,7 +19,6 @@ BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	%{name}-template
 Requires:	webapps
 Obsoletes:	viewcvs
-Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -169,7 +167,7 @@ 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 %{SOURCE2} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+cp -a %{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}
@@ -197,10 +195,10 @@ rm -rf $RPM_BUILD_ROOT
 %triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache-base
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache-base
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %if 0
diff --git a/viewvc-apache.conf b/viewvc-apache.conf
deleted file mode 100644
index 7e3de1a..0000000
--- a/viewvc-apache.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>
-
diff --git a/viewvc-httpd.conf b/viewvc-httpd.conf
index c05fbbb..7e3de1a 100644
--- a/viewvc-httpd.conf
+++ b/viewvc-httpd.conf
@@ -1,7 +1,7 @@
 <Directory /usr/share/viewvc>
     AllowOverride None
     Options +FollowSymlinks
-    Require all granted
+    Allow from all
 </Directory>
 
 # Version1 (default): under /cgi-bin/viewvc.cgi address
@@ -11,7 +11,7 @@ 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>
-#    Require all granted
+#    Allow from all
 #	<IfModule mod_python.c>
 #		AddHandler mod_python .py
 #		PythonPath "sys.path+['/usr/share/viewvc/bin/mod_python']"
@@ -28,7 +28,7 @@ ScriptAlias /cgi-bin/viewvc-query.cgi /usr/share/viewvc/bin/cgi/query.cgi
 #   DocumentRoot /usr/share/viewvc/bin/cgi/viewvc.cgi
 #   <Location />
 #       Options ExecCGI
-#       Require all granted
+#       Allow from all
 #   </Location>
 #</VirtualHost>
 
================================================================

---- gitweb:

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