- migrated to apache 2.4

diff --git a/lightirc.spec b/lightirc.spec
index 6616a2ec111ab047bfe2e7471ac8002136b43c9e..16d1f516152caa4913fbfb802b47d8a3b7ffff04 100644 (file)
--- a/lightirc.spec
+++ b/lightirc.spec
@@ -1,7 +1,7 @@
 Summary:       Flash IRC Chat
 Name:          lightirc
 Version:       0.9.9.3
-Release:       1
+Release:       2
 License:       free (but not open)
 Group:         Applications/WWW
 Source0:       http://www.lightirc.com/release/lightIRC_%{version}.zip
@@ -12,6 +12,7 @@ BuildRequires:        unzip
 Requires:      js-swfobject
 Requires:      webapps
 Requires:      webserver(alias)
+Conflicts:     apache-base < 2.4.0-1
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -40,6 +41,14 @@ Alias /%{name} %{_appdir}
 </Directory>
 EOF
 
+cat > httpd.conf <<'EOF'
+Alias /%{name}/swfobject.js %{_datadir}/swfobject/swfobject.js
+Alias /%{name} %{_appdir}
+<Directory %{_appdir}>
+       Require all granted
+</Directory>
+EOF
+
 cat > lighttpd.conf <<'EOF'
 alias.url += (
     "/%{name}/swfobject.js" => "%{_datadir}/swfobject/swfobject.js",
@@ -53,7 +62,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
 cp -a lightIRC/* $RPM_BUILD_ROOT%{_appdir}
 
 cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -a httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -a lighttpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %clean
@@ -65,10 +74,10 @@ rm -rf $RPM_BUILD_ROOT
 %triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerin -- lighttpd