--- rpms/smeserver-ocsinventory/contribs7/smeserver-ocsinventory.spec	2009/03/02 23:25:57	1.1
+++ rpms/smeserver-ocsinventory/contribs7/smeserver-ocsinventory.spec	2009/06/15 15:19:44	1.7
@@ -1,3 +1,4 @@
+# $Id: smeserver-ocsinventory.spec,v 1.6 2009/03/25 13:25:22 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
@@ -5,7 +6,7 @@ Summary: Open Computer and Software Inve
 %define name smeserver-ocsinventory
 Name: %{name}
 %define version 0.1
-%define release 4
+%define release 9
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -16,6 +17,11 @@ Patch2: smeserver-ocsinventory-0.1-db_co
 Patch3: smeserver-ocsinventory-0.1-templates2expand.patch
 Patch4: smeserver-ocsinventory-0.1-panel.patch
 Patch5: smeserver-ocsinventory-0.1-expand_mysql_fragment.patch
+Patch6: smeserver-ocsinventory-0.1-open_basedir.patch
+Patch7: smeserver-ocsinventory-0.1-update_path.patch
+Patch8: smeserver-ocsinventory-0.1-perl_version.patch
+Patch9: smeserver-ocsinventory-0.1-cert_change.patch
+Patch10: smeserver-ocsinventory-0.1-expand_php_ini.patch
 
 URL: http://sme.firewall-services.com
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
@@ -25,7 +31,7 @@ Requires: e-smith-release >= 7.0
 Requires: ocsinventory-server
 Requires: ocsinventory-reports
 
-
+Conflicts: smeserver-inventory-tools
 
 %description
 Open Computer and Software Inventory Next Generation is an application
@@ -38,6 +44,22 @@ such as switch, router, network printer
 OCS Inventory NG includes package deployment feature on client computers
 
 %changelog
+* Mon Jun 15 2009 Daniel B. <daniel@firewall-services.com> 0.1-9
+- expand php.ini template during ocs-update event
+
+* Wed Mar 25 2009 Daniel B. <daniel@firewall-services.com> 0.1-8
+- Should work with any perl version
+- Update cacert if it has changed
+
+* Thu Mar 19 2009 Daniel B. <daniel@firewall-services.com> 0.1-7
+- Update paths to the new "download" directory /var/lib/ocsinventory-reports
+
+* Wed Mar 18 2009 Daniel B. <daniel@firewall-services.com> 0.1-6
+- Correct openbasedir directive so package creation works
+
+* Mon Mar 16 2009 Daniel B. <daniel@firewall-services.com> 0.1-5
+- Conflicts with smeserver-inventory-tools
+
 * Tue Dec 09 2008 Daniel B. <daniel@firewall-services.com> 0.1-4
 - Add a link in the server-manager
 - expand mysql fragment during ocs-update event
@@ -60,6 +82,11 @@ OCS Inventory NG includes package deploy
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 /usr/bin/perl createlinks