- drop obsolete and outdated manual inclusion of rpm macros

[packages/cacti-plugin-thold.git] / cacti-plugin-thold.spec

diff --git a/cacti-plugin-thold.spec b/cacti-plugin-thold.spec
index 31c856a55ff09af33e102e2867be201163dcda3a..0b201797e37f40cf62adfcbea22c1b814f10405c 100644 (file)
--- a/cacti-plugin-thold.spec
+++ b/cacti-plugin-thold.spec
@@ -1,16 +1,16 @@
 %define                plugin  thold
 %define                php_min_version 5.1.1
-%include       /usr/lib/rpm/macros.php
 Summary:       Plugin for Cacti - Thold
 Summary(pl.UTF-8):     Wtyczka do Cacti - Thold
 Name:          cacti-plugin-%{plugin}
-Version:       0.4.9
+Version:       0.5.0
 Release:       1
 License:       GPL v2
 Group:         Applications/WWW
-Source0:       http://docs.cacti.net/_media/plugin:thold-v%{version}-3.tgz
-# Source0-md5: 18fa28a60cafa0d9821fb5d9a8cf7823
+Source0:       http://docs.cacti.net/_media/plugin:thold-v0.5.0.tgz
+# Source0-md5: c2a0f8072dd57c59f9c3608c2d6922cf
 Patch0:                %{name}-undefined_variable_subject.patch
+Patch1:                %{name}-division_by_zero.patch
 URL:           http://docs.cacti.net/plugin:thold
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
 Requires:      cacti
@@ -19,7 +19,7 @@ Requires:     cacti-plugin-settings >= 0.71
 Requires:      php(core) >= %{php_min_version}
 Requires:      php(gd)
 Requires:      php(pcre)
-Requires:      php-date
+Requires:      php(date)
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -45,9 +45,11 @@ monitorowanych parametrów.
 %setup -qc
 mv %{plugin}/{LICENSE,README} .
 
-%{__rm} thold/includes/.settings.php.swp
+# undos the source
+find '(' -name '*.php' -o -name '*.inc' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
 
 %patch0 -p1
+%patch1 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT