From 5b50a972dc4c2587e280ab90126243afbddac6ef Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Dec 17 2012 08:17:25 +0000
Subject: fix provided configuration when build with ocsserver defined


---

diff --git a/ocsinventory-agent.spec b/ocsinventory-agent.spec
index fd07a92..c7eae86 100644
--- a/ocsinventory-agent.spec
+++ b/ocsinventory-agent.spec
@@ -6,7 +6,7 @@ Name:      ocsinventory-agent
 Summary:   Open Computer and Software Inventory Next Generation client
 
 Version:   2.0.5
-Release:   4%{?dist}%{?ocstag:.%{ocstag}}
+Release:   5%{?dist}%{?ocstag:.%{ocstag}}
 
 Source0:   http://launchpad.net/ocsinventory-unix-agent/stable-2.0/%{version}/+download/Ocsinventory-Unix-Agent-%{version}.tar.gz
 
@@ -47,8 +47,8 @@ Requires:  smartmontools
 # Requires:  %{_sbindir}/dmidecode
 # Optionnal : ipdiscover or nmap, monitor-edid
 # Requires: ocsinventory-ipdiscover, nmap, monitor-edid, bridge-utils
-Obsoletes: ocsinventory-client <= 1.01
-Provides:  ocsinventory-client  = %{version}-%{release}
+Obsoletes: ocsinventory-client < %{version}
+Provides:  ocsinventory-client = %{version}-%{release}
 
 %{?perl_default_filter}
 
@@ -103,17 +103,18 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 # Mode, change to "none" to disable
 OCSMODE[0]=cron
 
+# used to override the %{name}.cfg setup.
+OCSSERVER[0]=%{ocsserver}
 %else
 # Mode, change to "cron" to activate
 OCSMODE[0]=none
 
-%endif
-
 # can be used to override the %{name}.cfg setup.
 # OCSSERVER[0]=your.ocsserver.name
 # 
 # corresponds with --local=%{_localstatedir}/lib/%{name}
 # OCSSERVER[0]=local
+%endif
 
 # Wait before inventory 
 OCSPAUSE[0]=100
@@ -129,13 +130,9 @@ cat <<EOF >%{name}.cfg
 # options used by cron job overides this (see /etc/sysconfig/%{name})
 #
 
-%if 0%{?ocsserver:1}
-server = http://%{ocsserver}/ocsinventory
-%else
 # Server URL, unconmment if needed
 # server = your.ocsserver.name
 local = %{_localstatedir}/lib/%{name}
-%endif
 
 # Administrative TAG (optional, must be filed before first inventory)
 # tag = your_tag
@@ -190,6 +187,7 @@ rm %{buildroot}%{perl_vendorlib}/Ocsinventory/Unix/postinst.pl
 # Provided by ocsinventtory-ipdiscover
 rm %{buildroot}%{_sbindir}/ipdiscover
 
+
 %clean
 rm -rf %{buildroot}
 
@@ -215,6 +213,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 17 2012 Remi Collet <remi@fedoraproject.org> - 2.0.5-5
+- fix provided configuration when build with ocsserver defined
+
 * Sun Sep 23 2012 Remi Collet <remi@fedoraproject.org> - 2.0.5-4
 - fix ifconfig output parser (#853982)
   https://bugs.launchpad.net/bugs/1045356