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

[glen]

commit ab52a567506ce7d793aaaba2fd8bf93f0d3e728d
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Sep 1 11:06:56 2013 +0300

    Revert "- migrated to apache 2.4"
    
    This reverts commit 503ebcb5dd295c8184c7c48fd1207fa511d132c8.

 httpd.conf  | 21 ---------------------
 minify.spec | 14 ++++++--------
 2 files changed, 6 insertions(+), 29 deletions(-)
---
diff --git a/minify.spec b/minify.spec
index 842abf1..479178d 100644
--- a/minify.spec
+++ b/minify.spec
@@ -3,16 +3,13 @@
 Summary:	Combines, minifies, and caches JavaScript and CSS files on demand to speed up page loads
 Name:		minify
 Version:	2.1.5
-Release:	10
+Release:	9
 License:	New BSD License
 Group:		Applications/WWW
 #Source0:	https://minify.googlecode.com/files/%{name}-%{version}.zip
 Source0:	https://github.com/mrclay/minify/tarball/master/%{name}-%{version}.tgz
 # Source0-md5:	7ead5f2bc26630c16b206c7c50e2aba1
 #Source0:	https://github.com/glensc/minify/tarball/lesscss#/%{name}-less-%{version}.tgz
-Source1:	apache.conf
-Source2:	lighttpd.conf
-Source3:	httpd.conf
 Patch0:		paths.patch
 Patch1:		pear-firephp.patch
 Patch2:		yui-path.patch
@@ -22,6 +19,8 @@ Patch3:		https://github.com/glensc/minify/commit/a82d70b0baaa85c8ca234e39918d678
 Patch4:		https://github.com/glensc/minify/commit/32abbfa328dcccf785452dd9cd032f224e378645.patch
 # https://github.com/mrclay/minify/pull/47
 Patch5:		https://github.com/glensc/minify/commit/8c54519b32b2230293be60c5f9a8f514401171fc.patch
+Source1:	apache.conf
+Source2:	lighttpd.conf
 URL:		http://code.google.com/p/minify/
 BuildRequires:	rpmbuild(macros) >= 1.654
 BuildRequires:	unzip
@@ -29,7 +28,6 @@ Requires:	php(core) >= %{php_min_version}
 Requires:	php(pcre)
 Requires:	php-%{name} = %{version}-%{release}
 Requires:	webapps
-Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -121,7 +119,7 @@ done
 
 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
 
 %triggerin -- apache1 < 1.3.37-3, apache1-base
 %webapp_register apache %{_webapp}
@@ -129,10 +127,10 @@ cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.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
diff --git a/httpd.conf b/httpd.conf
deleted file mode 100644
index 3b30a19..0000000
--- a/httpd.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-Alias /min/ /usr/share/minify/
-
-<Directory /usr/share/minify>
-	Require all granted
-
-	php_value zlib.output_compression 0
-	<IfModule mod_rewrite.c>
-		RewriteEngine on
-
-		# You may need RewriteBase on some servers
-		RewriteBase /min
-
-		# rewrite URLs like "/min/f=..." to "/min/?f=..."
-		RewriteRule ^([bfg]=.*)  index.php?$1 [L,NE]
-	</IfModule>
-
-	<IfModule mod_env.c>
-		# In case AddOutputFilterByType has been added
-		SetEnv no-gzip
-	</IfModule>
-</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/minify.git/commitdiff/efd5420d0803136eef2c6ca7c433d66c6587b18e