[projects/template-specs] Revert "- migrate to apache 2.4"

[glen]

commit 8185008cc8603fd9506a8b7d993777e0fbadd688
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Sep 14 02:32:11 2013 +0300

    Revert "- migrate to apache 2.4"
    
    This reverts commit 0abb98ca0aed7f74b6e2c633d20ae43f4b97ca1b.

 webapp.spec | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)
---
diff --git a/webapp.spec b/webapp.spec
index ed6d935..c768f33 100644
--- a/webapp.spec
+++ b/webapp.spec
@@ -1,17 +1,14 @@
 Summary:	Package that uses webapps configuration
 Summary(pl.UTF-8):	Pakiet używający konfiguracji aplikacji WWW
 Name:		template-webapp
-Version:	0.4
-Release:	0.4
+Version:	0.3
+Release:	0.3
 License:	GPL
 Group:		Applications/WWW
 #Source0:	%{name}-%{version}.tar.gz
 # Source0-md5:	-
-# For apache 1.x
 Source1:	apache.conf
-# For apache 2.4+
-Source2:	httpd.conf
-Source3:	lighttpd.conf
+Source2:	lighttpd.conf
 #URL:		-
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	webapps
@@ -24,7 +21,6 @@ Requires:	webapps
 #Requires:	webserver(php)
 #Requires:	webserver(rewrite)
 #Requires:	webserver(setenv)
-Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -54,13 +50,6 @@ Alias /%{name} %{_appdir}
 </Directory>
 EOF
 
-cat > httpd.conf <<'EOF'
-Alias /%{name} %{_appdir}
-<Directory %{_appdir}>
-	Require all granted
-</Directory>
-EOF
-
 cat > lighttpd.conf <<'EOF'
 alias.url += (
 	"/%{name}" => "%{_appdir}",
@@ -73,16 +62,16 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
 
 cp -p apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -p httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -p lighttpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 mv $RPM_BUILD_ROOT{%{_appdir},%{_sysconfdir}}/apache.conf
-mv $RPM_BUILD_ROOT{%{_appdir},%{_sysconfdir}}/httpd.conf
 mv $RPM_BUILD_ROOT{%{_appdir},%{_sysconfdir}}/lighttpd.conf
+cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
 
 # %webapp_* macros usage extracted from /usr/lib/rpm/macros.build:
 #
@@ -96,10 +85,10 @@ cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 %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}
 
 %triggerin -- lighttpd
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/template-specs.git/commitdiff/b6cd57ed6524c9d40aac1d2da2513235d5b4d3de