upgrade ndoutils schema to 1.5.2

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

diff --git a/cacti-plugin-npc.spec b/cacti-plugin-npc.spec
index 68ee8a4da629ca33e8ac8da97111ab390d6939f5..f9f0c1bdc57089bafc86a5bf281296d0f810c677 100644 (file)
--- a/cacti-plugin-npc.spec
+++ b/cacti-plugin-npc.spec
@@ -1,5 +1,6 @@
 # TODO
-# - system Doctrine: phpdoctrine.spec
+# - bundles Doctrine 1.0.7: use system phpdoctrine.spec
+# - bundles Ext JS Library 2.2
 # - forum thread: http://forums.cacti.net/viewtopic.php?t=26540
 %define                plugin  npc
 %define                php_min_version 5.2.1
@@ -8,30 +9,32 @@ Summary:      Nagios Plugin for Cacti (NPC)
 Summary(pl.UTF-8):     Wtyczka do Cacti - NPC
 Name:          cacti-plugin-npc
 Version:       2.0.4
-Release:       0.2
+Release:       0.7
 License:       GPL v3
 Group:         Applications/WWW
 #Source0:      http://downloads.sourceforge.net/gibtmirdas/npc-%{version}.tar.gz
 Source0:       npc-%{version}.tar.gz
+Patch0:                %{name}-graphs_url.patch
+Patch1:                ndoutils-1.5.patch
 # Source0-md5: 7b30302c544f10ed73cff406fda14499
 URL:           https://trac.assembla.com/npc/
 BuildRequires: rpmbuild(macros) >= 1.553
 Requires:      cacti >= 0.8.7b
 Requires:      cacti(pia) >= 2.0
 Requires:      nagios >= 3.0
-Requires:      php-common >= 4:%{php_min_version}
-Requires:      php-ctype
 Requires:      nagios-ndoutils >= 1.4b7
-Requires:      php-date
-Requires:      php-iconv
-Requires:      php-json
-Requires:      php-mbstring
-Requires:      php-mysql
-Requires:      php-mysqli
-Requires:      php-pcre
-Requires:      php-session
-Requires:      php-simplexml
-Requires:      php-spl
+Requires:      php(core) >= %{php_min_version}
+Requires:      php(ctype)
+Requires:      php(date)
+Requires:      php(iconv)
+Requires:      php(json)
+Requires:      php(mbstring)
+Requires:      php(mysql)
+Requires:      php(mysqli)
+Requires:      php(pcre)
+Requires:      php(session)
+Requires:      php(simplexml)
+Requires:      php(spl)
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -57,6 +60,20 @@ mv %{plugin}/*.debug .
 mv %{plugin}/build.xml .
 mv %{plugin}/{README,LICENSE} .
 %undos -f php README
+%patch0 -p1
+%patch1 -p1
+
+cd %{plugin}
+
+# part of ndoutils
+%{__rm} -r queries
+# upgrade_schema.sql - adds indexes to db
+
+# dev code, not needed for production functionality
+%{__rm} controllers/layoutDev.php
+%{__rm} -r js/src
+%{__rm} js/ext/*-debug.js
+%{__rm} js/ext/resources/resources.jsb
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -69,4 +86,19 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README
-%{plugindir}
+%dir %{plugindir}
+%attr(755,root,root) %{plugindir}/cli.php
+%attr(755,root,root) %{plugindir}/perfdata.php
+%{plugindir}/config.php
+%{plugindir}/index.php
+%{plugindir}/nagioscmd.php
+%{plugindir}/npc.php
+%{plugindir}/setup.php
+%{plugindir}/top_graph_header.php
+%{plugindir}/upgrade_schema.sql
+%{plugindir}/controllers
+%{plugindir}/css
+%{plugindir}/images
+%{plugindir}/js
+%{plugindir}/lib
+%{plugindir}/models