[packages/js-swfobject] Revert "- migrated to apache 2.4"

[glen]

commit e9f029ec7d0c1685876735135d25ddd143dfe9dc
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Aug 27 17:11:01 2013 +0300

    Revert "- migrated to apache 2.4"
    
    This reverts commit f1b1babc333882e39aaa857350f57195a5d32c6a.

 httpd.conf        |  6 ------
 js-swfobject.spec | 10 ++++------
 2 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/js-swfobject.spec b/js-swfobject.spec
index 00fa27d..8f87136 100644
--- a/js-swfobject.spec
+++ b/js-swfobject.spec
@@ -4,14 +4,13 @@ Summary:	JavaScript Flash Player detection and embed script
 Summary(pl.UTF-8):	Skrypt w JavaScripcie do wykrywania i osadzania Flash Playera
 Name:		js-%{plugin}
 Version:	2.2
-Release:	3
+Release:	2
 License:	MIT
 Group:		Applications/WWW
 Source0:	http://swfobject.googlecode.com/files/swfobject_%{ver}.zip
 # Source0-md5:	dec4b83b3e73f3f0011a075cd5385b9c
 Source1:	apache.conf
 Source2:	lighttpd.conf
-Source3:	httpd.conf
 URL:		http://code.google.com/p/swfobject/
 BuildRequires:	closure-compiler
 BuildRequires:	js
@@ -20,7 +19,6 @@ Requires:	webapps
 Requires:	webserver(alias)
 Provides:	swfobject = %{version}-%{release}
 Obsoletes:	swfobject
-Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -77,7 +75,7 @@ ln -s %{plugin}-%{version}.min.js $RPM_BUILD_ROOT%{_appdir}/%{plugin}.js
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
-cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -88,10 +86,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}
 
 %triggerin -- lighttpd
diff --git a/httpd.conf b/httpd.conf
deleted file mode 100644
index 9cc94f3..0000000
--- a/httpd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Alias /js/swfobject.js /usr/share/swfobject/swfobject.js
-Alias /js/swfobject/ /usr/share/swfobject/
-<Directory /usr/share/swfobject>
-	Require all granted
-	Options +FollowSymLinks
-</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/js-swfobject.git/commitdiff/527727a26fe893df0432001c1f324445cea0760a