rpms/ocsinventory-client/devel ocsinventory-client.spec,1.6,1.7

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/ocsinventory-client/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7999

Modified Files:
	ocsinventory-client.spec 
Log Message:
     remove BuildRequires dmidecode


Index: ocsinventory-client.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-client/devel/ocsinventory-client.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocsinventory-client.spec	8 Apr 2007 18:08:58 -0000	1.6
+++ ocsinventory-client.spec	8 Apr 2007 18:42:00 -0000	1.7
@@ -10,7 +10,7 @@
 
 Name:      ocsinventory-client
 Version:   1.01
-Release:   3%{?dist}%{?ocstag:.}%{?ocstag}
+Release:   4%{?dist}%{?ocstag:.}%{?ocstag}
 Summary:   Open Computer and Software Inventory Next Generation client
 
 Group:     Development/Libraries
@@ -24,7 +24,7 @@
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: %{_sbindir}/dmidecode, perl
+BuildRequires: perl
 %if %{?fedora}0
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 %else
@@ -93,7 +93,7 @@
 cat <<EOF >ocsinv.conf
 <CONF>
   <DEVICEID>OCS_AGENT_DEVICE_ID</DEVICEID>
-  <DMIVERSION>$(%{_sbindir}/dmidecode 2>/dev/null | grep "# dmidecode" | cut -d' ' -f3)</DMIVERSION>
+  <DMIVERSION>DMIDECODE_VERSION</DMIVERSION>
   <IPDISCOVER_VERSION>3</IPDISCOVER_VERSION>
   <OCSFSERVER>%{?ocsserver}%{!?ocsserver:__local__}</OCSFSERVER>
   <UPDATE>0</UPDATE>
@@ -158,7 +158,9 @@
 if [ "$1" -eq "1" ]
 then   
     OCS_AGENT_DEVICE_ID=$(hostname)-$(date +%%Y-%%m-%%d-%%H-%%M-%%S)
-    %{__perl} -pi -e "s/OCS_AGENT_DEVICE_ID/$OCS_AGENT_DEVICE_ID/" %{_sysconfdir}/%{name}/ocsinv.conf
+    DMIDECODE_VERSION=$(%{_sbindir}/dmidecode 2>/dev/null | grep "# dmidecode" | cut -d' ' -f3)
+    %{__perl} -pi -e "s/OCS_AGENT_DEVICE_ID/$OCS_AGENT_DEVICE_ID/;s/DMIDECODE_VERSION/$DMIDECODE_VERSION/" \
+        %{_sysconfdir}/%{name}/ocsinv.conf
 else
 # Update from RC3
     %{__perl} -pi -e "s/>local</>__local__</" %{_sysconfdir}/%{name}/ocsinv.conf
@@ -178,6 +180,10 @@
 
 
 %changelog
+* Sun Apr 08 2007 Remi Collet <Fedora at famillecollet.com> 1.01-4
+- remove BuildRequires dmidecode
+- check dmidecode in post scriptlet (not in prep)
+
 * Sun Apr 08 2007 Remi Collet <Fedora at famillecollet.com> 1.01-3
 - change to noarch again.