- use require instead of include to make permission problems fatal

[packages/cacti.git] / cacti.spec

diff --git a/cacti.spec b/cacti.spec
index b5b250bb76a374bb4688623d22ecd82338fba04d..52a2f4c36c37b6ef3b6c3f199a59e9171bda08ea 100644 (file)
--- a/cacti.spec
+++ b/cacti.spec
@@ -2,20 +2,19 @@
 Summary:       Cacti is a PHP frontend for rrdtool
 Summary(pl.UTF-8):     Cacti - frontend w PHP do rrdtoola
 Name:          cacti
-Version:       0.8.7d
-Release:       2
+Version:       0.8.7e
+Release:       5
 License:       GPL
 Group:         Applications/WWW
 Source0:       http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: 0822068bfa547278e94d3143ef9279e0
+# Source0-md5: 7563a58a57d2c6cc0da28cc341a30969
 Source1:       %{name}.cfg.php
 Source2:       %{name}.crontab
 Source3:       %{name}-apache.conf
 Source4:       %{name}-lighttpd.conf
 Source5:       %{name}-rrdpath.sql
-Source5:       %{name}-rrdpath.sql
 Source6:       %{name}-pa.sql
-Patch0:                cacti-plugin-%{version}-PA-v2.4.diff
+Patch0:                %{name}-plugin-%{version}-PA-v2.5.diff
 Patch1:                %{name}-config.patch
 Patch2:                %{name}-adodb.patch
 Patch3:                %{name}-ioerror.patch
@@ -24,11 +23,7 @@ Patch5:              %{name}-linux_memory.patch
 Patch6:                %{name}-log-verbosity.patch
 Patch7:                %{name}-ss_disk-array-indices.patch
 Patch8:                %{name}-rrdresourcecheck.patch
-Patch100:      http://www.cacti.net/downloads/patches/0.8.7d/ping_timeout.patch
-Patch101:      http://www.cacti.net/downloads/patches/0.8.7d/graph_search.patch
-Patch102:      %{name}-page_length_graph_view.patch
-# http://www.cacti.net/downloads/patches/0.8.7d/page_length_graph_view.patch
-Patch103:      http://www.cacti.net/downloads/patches/0.8.7d/snmp_string_issue_with_rrdtool_creation.patch
+Patch9:                host_name-url.patch
 URL:           http://www.cacti.net/
 BuildRequires: rpm-perlprov
 BuildRequires: sed >= 4.0
@@ -42,6 +37,7 @@ Requires:     net-snmp-utils
 Requires:      php(gd)
 Requires:      php(mysql)
 Requires:      php(pcre)
+Requires:      php(session)
 Requires:      php(snmp)
 Requires:      php(xml)
 Requires:      php-cli
@@ -122,10 +118,7 @@ Dokumentacja do Cacti w formacie HTML.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
+%patch9 -p1
 
 mkdir -p sql
 mv *.sql sql
@@ -147,6 +140,11 @@ chmod a+rx cli/*
 
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
+rm log/.placeholder
+
+# make sure cacti runs out of the box
+sed -e "s,new_install,%{version}," -i sql/cacti.sql
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_appdir}/{docs,plugins},/etc/cron.d,%{_sbindir}}
@@ -209,7 +207,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc docs/CHANGELOG docs/CONTRIB docs/README docs/text/manual.txt
+%doc docs/CHANGELOG docs/CONTRIB docs/README docs/txt/manual.txt
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf