- migrate to apache 2.4

- rel 4

diff --git a/cacti-httpd.conf b/cacti-httpd.conf
new file mode 100644 (file)
index 0000000..b462723
--- /dev/null
+++ b/cacti-httpd.conf
@@ -0,0 +1,5 @@
+Alias /cacti /usr/share/cacti
+
+<Directory /usr/share/cacti>
+       Require all granted
+</Directory>

diff --git a/cacti.spec b/cacti.spec
index 622cb76f62c29b58373a02c697e356feb90874a0..7ea698bdd56fee8db333197b2384d0dbf312d9e8 100644 (file)
--- a/cacti.spec
+++ b/cacti.spec
@@ -3,7 +3,7 @@ Summary:        Cacti is a PHP frontend for rrdtool
 Summary(pl.UTF-8):     Cacti - frontend w PHP do rrdtoola
 Name:          cacti
 Version:       0.8.8a
-Release:       3
+Release:       4
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@ Source3:      %{name}-apache.conf
 Source4:       %{name}-lighttpd.conf
 Source5:       %{name}-rrdpath.sql
 Source7:       %{name}.logrotate
+Source8:       %{name}-httpd.conf
 Patch0:                mysql-socket.patch
 Patch1:                %{name}-config.patch
 Patch2:                %{name}-adodb.patch
@@ -55,6 +56,7 @@ Provides:     user(cacti)
 Obsoletes:     cacti-add_template
 Obsoletes:     cacti-plugin-update
 Conflicts:     logrotate < 3.8.0
+Conflicts:     apache-base < 2.4.0-1
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -174,7 +176,7 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}
 cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %clean
@@ -201,10 +203,10 @@ fi
 %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