--- rpms/smeserver-ocsinventory/contribs7/smeserver-ocsinventory.spec	2009/03/02 23:53:29	1.2
+++ rpms/smeserver-ocsinventory/contribs7/smeserver-ocsinventory.spec	2009/03/16 15:39:47	1.3
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: smeserver-ocsinventory.spec,v 1.2 2009/03/02 23:53:29 slords Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
@@ -6,7 +6,7 @@ Summary: Open Computer and Software Inve
 %define name smeserver-ocsinventory
 Name: %{name}
 %define version 0.1
-%define release 4
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -26,7 +26,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
@@ -39,6 +39,9 @@ such as switch, router, network printer
 OCS Inventory NG includes package deployment feature on client computers
 
 %changelog
+* 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