- Add patch from date 2010/07/27 more info http://www.cacti.net/download_patches.php

[packages/cacti.git] / cacti.spec

diff --git a/cacti.spec b/cacti.spec
index 90d415975d283c8cdae01d14e9e2bc46bbb96e6b..7e5451f193ea820ad5de589fa30b092321a25ecf 100644 (file)
--- a/cacti.spec
+++ b/cacti.spec
@@ -1,26 +1,25 @@
+#
+# Conditional build:
+%bcond_without pa              # without plugin archidecture patch
+
 %include       /usr/lib/rpm/macros.perl
 Summary:       Cacti is a PHP frontend for rrdtool
 Summary(pl.UTF-8):     Cacti - frontend w PHP do rrdtoola
 Name:          cacti
-Version:       0.8.7e
-Release:       8
+Version:       0.8.7g
+Release:       2
 License:       GPL
 Group:         Applications/WWW
 Source0:       http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: 7563a58a57d2c6cc0da28cc341a30969
+# Source0-md5: 268421cb1a58d3444f7ecbddb4c4b016
 Source1:       %{name}.cfg.php
 Source2:       %{name}.crontab
 Source3:       %{name}-apache.conf
 Source4:       %{name}-lighttpd.conf
 Source5:       %{name}-rrdpath.sql
 Source6:       %{name}-pa.sql
-Patch100:      http://www.cacti.net/downloads/patches/0.8.7e/cli_add_graph.patch
-Patch101:      http://www.cacti.net/downloads/patches/0.8.7e/snmp_invalid_response.patch
-Patch102:      http://www.cacti.net/downloads/patches/0.8.7e/template_duplication.patch
-Patch103:      http://www.cacti.net/downloads/patches/0.8.7e/fix_icmp_on_windows_iis_servers.patch
-Patch104:      http://www.cacti.net/downloads/patches/0.8.7e/cross_site_fix.patch
 # http://cactiusers.org/wiki/PluginArchitectureInstall
-# http://mirror.cactiusers.org/downloads/plugins/cacti-plugin-0.8.7e-PA-v2.6.zip
+# http://mirror.cactiusers.org/downloads/plugins/cacti-plugin-0.8.7g-PA-v2.8.tar.gz
 Patch0:                %{name}-PA.patch
 Patch1:                %{name}-config.patch
 Patch2:                %{name}-adodb.patch
@@ -29,9 +28,17 @@ Patch4:              %{name}-webroot.patch
 Patch5:                %{name}-linux_memory.patch
 Patch6:                %{name}-log-verbosity.patch
 Patch7:                %{name}-ss_disk-array-indices.patch
-Patch8:                %{name}-rrdresourcecheck.patch
-Patch9:                host_name-url.patch
-Patch10:       cli-relpath.patch
+Patch8:                host_name-url.patch
+Patch9:                cli-relpath.patch
+# http://www.cacti.net/download_patches.php
+Patch10:       data_source_deactivate.patch
+Patch11:       graph_list_view.patch
+Patch12:       html_output.patch
+Patch13:       ldap_group_authenication.patch
+Patch14:       script_server_command_line_parse.patch
+Patch15:       ping.patch
+Patch16:       poller_interval.patch
+
 URL:           http://www.cacti.net/
 BuildRequires: rpm-perlprov
 BuildRequires: sed >= 4.0
@@ -42,13 +49,13 @@ Requires:   adodb >= 4.67-1.17
 Requires:      crondaemon
 Requires:      group(http)
 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
+Requires:      php-common >= 4:5.2.13-10
+Requires:      php-mysql
+Requires:      php-pcre
+Requires:      php-session
+Requires:      php-snmp
+Requires:      php-xml
 Requires:      rrdtool
 Requires:      webapps
 Requires:      webserver
@@ -57,6 +64,7 @@ Requires:     webserver(alias)
 Requires:      webserver(indexfile)
 Requires:      webserver(php)
 Suggests:      cacti-spine
+Suggests:      php-gd
 Provides:      user(cacti)
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -117,12 +125,15 @@ Dokumentacja do Cacti w formacie HTML.
 
 %prep
 %setup -q
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch0 -p1
+%{?with_pa:%patch0 -p1}
+%patch10 -p1 
+%patch11 -p1 
+%patch12 -p1 
+%patch13 -p1 
+%patch14 -p1 
+%patch15 -p1 
+%patch16 -p1 
+
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -132,7 +143,6 @@ Dokumentacja do Cacti w formacie HTML.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
 
 mkdir -p sql
 mv *.sql sql
@@ -145,6 +155,7 @@ rm -rf lib/adodb
 rm -f log/.htaccess
 rm -f cli/.htaccess
 rm -f rra/.placeholder
+rm -f rra/.htaccess
 
 # must require libs to get fatals on missing files, not include
 %{__sed} -i -e '
@@ -161,8 +172,6 @@ chmod a+rx scripts/*.php cli/*.php
 
 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