--- rpms/smeserver-cacti/contribs8/smeserver-cacti.spec	2013/10/18 20:45:27	1.5
+++ rpms/smeserver-cacti/contribs8/smeserver-cacti.spec	2014/06/17 18:35:32	1.12
@@ -1,21 +1,27 @@
-# $Id: smeserver-cacti.spec,v 1.4 2013/10/18 14:46:30 unnilennium Exp $
+# $Id: smeserver-cacti.spec,v 1.11 2013/11/21 22:31:24 unnilennium Exp $
 # Authority: nocvs
 # Name: Michel Van hees
 
 Summary: Cacti for smeserver
 %define name smeserver-cacti
 Name: %{name}
-%define version 0.8.8b
-%define release 6
+%define version 0.8.8b1
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: Freely distributable
 Group: Apache
 Source: %{name}-%{version}.tar.gz
-Patch0: smeserver-cacti-0.8.8b-patch0.patch
-Patch1: smeserver-cacti-0.8.8b-patch1.patch
-Patch2: smeserver-cacti-0.8.8b-patch2.patch
-Patch3: smeserver-cacti-0.8.8b-patch3.patch
+#REM contribs9 Patch0: smeserver-cacti-0.8.8b1-patch0.patch
+#REM contribs9 Patch1: smeserver-cacti-0.8.8b1-patch1.patch
+#REM contribs9 Patch2: smeserver-cacti-0.8.8b1-patch2.patch
+#REM contribs9 Patch3: smeserver-cacti-0.8.8b1-patch3.patch
+#REM contribs9 Patch4: smeserver-cacti-0.8.8b1-patch4.patch
+#REM contribs9 Patch5: smeserver-cacti-0.8.8b1-patch5.patch
+#REM contribs9 Patch6: smeserver-cacti-0.8.8b1-patch6.patch
+#REM contribs9 Patch7: smeserver-cacti-0.8.8b1-patch7.patch
+#REM contribs9 Patch8: smeserver-cacti-0.8.8b1-poller.patch
+#REM contribs9 Patch9: smeserver-cacti-0.8.8b1-disenabled.patch
 #Patch:%{name}-%{version}.patch.yyyymmddnn
 BuildRoot: /var/tmp/e-smith-buildroot
 BuildRequires: e-smith-devtools
@@ -25,11 +31,30 @@ Requires: cacti = 0.8.8b-2.el5
 AutoReqProv: no
 
 %changelog
-* Fri Oct 18 2013 Jean-Philippe Pialasse <tests@pialasse.com> 0.8.8b-6.sme
+* Mon Jun 16 2014 JP Pialasse <tests@pialasse.com> 0.8.8b1-1.sme
+- initial import to SME9 contribs
+
+* Thu Nov 21 2013 Jean-Philippe Pialasse <tests@pialasse.com> 0.8.8b-12.sme
+- fixed poller not running in cron , added to crontab
+- fixed wrong ownership for db.php, now cacti:www
+- added status enabled by default
+- user cacti to run in cron
+
+* Tue Nov 14 2013 Jean-Philippe Pialasse <tests@pialasse.com> 0.8.8b-10.sme
+- typo fix in last patch (7)
+
+* Sun Nov 10 2013 Jean-Philippe Pialasse <tests@pialasse.com> 0.8.8b-9.sme
+- fix paths in sql dump  [SME: 7419]
+
+* Mon Oct 21 2013 Jean-Philippe Pialasse <tests@pialasse.com> 0.8.8b-8.sme
+- fixing last template path error in createlinks
+
+* Fri Oct 18 2013 Jean-Philippe Pialasse <tests@pialasse.com> 0.8.8b-7.sme
 - fix missing type
 - fix wrong path in Virtualhost template
 - fix DB not creating
 - fix extra file in template
+- updated db mysql default
 
 * Tue Oct 15 2013 Jean-Philippe Pialasse <tests@pialasse.com> 0.8.8b-3.sme
 - initial release for SME 8
@@ -51,10 +76,16 @@ SME server - Cacti
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+#REM contribs9 %patch0 -p1
+#REM contribs9 %patch1 -p1
+#REM contribs9 %patch2 -p1
+#REM contribs9 %patch3 -p1
+#REM contribs9 %patch4 -p1
+#REM contribs9 %patch5 -p1
+#REM contribs9 %patch6 -p1
+#REM contribs9 %patch7 -p1
+#REM contribs9 %patch8 -p1
+#REM contribs9 %patch9 -p1
 
 %build
 perl createlinks