Author: glen                         Date: Fri Oct 28 09:46:44 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.826, package sharednetworkclass, fill deps, cleanup junk

---- Files affected:
packages/cacti-plugin-configmanager:
   cacti-plugin-configmanager.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/cacti-plugin-configmanager/cacti-plugin-configmanager.spec
diff -u 
packages/cacti-plugin-configmanager/cacti-plugin-configmanager.spec:1.10 
packages/cacti-plugin-configmanager/cacti-plugin-configmanager.spec:1.11
--- packages/cacti-plugin-configmanager/cacti-plugin-configmanager.spec:1.10    
Sun May 16 16:13:34 2010
+++ packages/cacti-plugin-configmanager/cacti-plugin-configmanager.spec Fri Oct 
28 11:46:39 2011
@@ -1,31 +1,42 @@
 # $Revision$, $Date$
-# TODO
-# - source1 not used?!
 %define                plugin configmanager
-%include       /usr/lib/rpm/macros.perl
+%define                php_min_version 5.0.0
+%include       /usr/lib/rpm/macros.php
 Summary:       Plugin for Cacti - download/upload routers and switches 
configuration
 Summary(pl.UTF-8):     Wtyczka do Cacti - ściąganie/wysyłanie konfiguracji 
routerów/switchy
 Name:          cacti-plugin-%{plugin}
-Version:       0.76
+Version:       0.826
 Release:       1
 License:       GPL v2
 Group:         Applications/WWW
 # http://forums.cacti.net/download.php?id=6449
-Source0:       %{plugin}%{version}.zip
+Source0:       
http://forums.cacti.net/download/file.php?id=21891#/%{plugin}-%{version}.zip
 # Source0-md5: d3cdb035a4d47ff464916774dd953457
 # http://forums.cacti.net/download.php?id=10980
 Source1:       sharednetworkclass0.40.zip
 # Source1-md5: b438751d7b696a10a8958ea6e0f407f3
-URL:           http://forums.cacti.net/about12406.html
-BuildRequires: rpm-perlprov
+URL:           http://docs.cacti.net/userplugin:configmanager
+BuildRequires: rpm-php-pearprov >= 4.4.2-11
+BuildRequires: rpmbuild(macros) >= 1.553
 BuildRequires: unzip
 Requires:      cacti
+Requires:      cacti(pia) >= 2.0
+Requires:      php-common >= 4:%{php_min_version}
+Requires:      php-date
+Requires:      php-mysql
+Requires:      php-pcre
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                cactidir                /usr/share/cacti
 %define                plugindir               %{cactidir}/plugins/%{plugin}
 
+# bad depsolver
+%define                _noautopear     pear(include/config.php)
+
+# put it together for rpmbuild
+%define                _noautoreq      %{?_noautophp} %{?_noautopear}
+
 %description
 With Cacti configmanager plugin you can easily schedule the
 download/upload of the configuration of your routers, switches and any
@@ -35,7 +46,8 @@
 
 There are two methods:
 - "TFTP" (based of "pancho" <http://www.pancho.org/>); with "pure PHP"
-  option there is no need of pancho installation
+  option there is no need of pancho installation (depreciated after
+  v0.9)
 - "multi" can use any scripts or SCP, FTP, SFTP or what you want.
 
 %description -l pl.UTF-8
@@ -52,23 +64,33 @@
 
 %prep
 %setup -qc -a1
+%undos -f php,inc,txt
+
+mv %{plugin}/{Manual.txt,template.txt,configmanager_trap_list.txt} .
+
+# bad os
+%{__rm} %{plugin}/scripts/*.cmd
 
-# undos the source
-find '(' -name '*.php' -o -name '*.inc' ')' -print0 | xargs -0 sed -i -e 
's,\r$,,'
+# unwanted junk
+mv %{plugin}/OLD .
+
+# deprecated since 0.9, but package for now (see Manual.txt)
+mv sharednetworkclass{0.40,}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{plugindir}
-
-cp -a %{plugin}%{version}/* $RPM_BUILD_ROOT%{plugindir}
+cp -a %{plugin}/* $RPM_BUILD_ROOT%{plugindir}
+cp -a sharednetworkclass $RPM_BUILD_ROOT%{cactidir}/plugins
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc %{plugin}%{version}/{Manual.txt,template.txt,configmanager_trap_list.txt}
+%doc Manual.txt template.txt configmanager_trap_list.txt
 %{plugindir}
+%{cactidir}/plugins/sharednetworkclass
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -76,6 +98,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2011/10/28 09:46:39  glen
+- up to 0.826, package sharednetworkclass, fill deps, cleanup junk
+
 Revision 1.10  2010/05/16 14:13:34  sparky
 - BR: unzip
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti-plugin-configmanager/cacti-plugin-configmanager.spec?r1=1.10&r2=1.11&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to