rpms/ocsinventory-client/FC-6 ocsinventory-client.spec, 1.3, 1.4 sources, 1.3, 1.4

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/ocsinventory-client/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2945

Modified Files:
	ocsinventory-client.spec sources 
Log Message:
    new version 1.01


Index: ocsinventory-client.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-client/FC-6/ocsinventory-client.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocsinventory-client.spec	28 Jan 2007 08:34:19 -0000	1.3
+++ ocsinventory-client.spec	9 Apr 2007 05:47:46 -0000	1.4
@@ -1,32 +1,37 @@
-%define tarname OCSNG_LINUX_AGENT_1.0
+%define tarname OCSNG_LINUX_AGENT_1.01
 
 # Can, optionaly, be define at build time (see README.fedora)
 # - ocstag    : administrative tag
 # - ocsserver : OCS Inventory NG communication serveur
 
-ExclusiveArch: i386 x86_64
+# This requires dmidecode (at run time) which is only available on x86.
+ExcludeArch: ppc ppc64 s390 s390x ia64
 
 Name:      ocsinventory-client
-Version:   1.0
-Release:   1%{?dist}%{?ocstag:.}%{?ocstag}
+Version:   1.01
+Release:   5%{?dist}%{?ocstag:.}%{?ocstag}
 Summary:   Open Computer and Software Inventory Next Generation client
 
 Group:     Development/Libraries
 License:   GPL
 URL:       http://ocsinventory.sourceforge.net/
-Source0:   http://heanet.dl.sourceforge.net/sourceforge/ocsinventory/%{tarname}.tar.gz
+Source0:   http://downloads.sourceforge.net/sourceforge/ocsinventory/%{tarname}.tar.gz
 Source1:   ocsinventory-client.README
 Source2:   ocsinventory-client.README.fr
 Patch0:    ocsinventory-client.patch
 
-# Not noarch because of ipdiscover.c - BuildArch: noarch
+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
+%if %{?rhel}0 < 50
 %define perl_vendorlib  %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%else
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+%endif
 %endif
 Requires:  %{_sbindir}/dmidecode, net-tools, pciutils
 Requires:  %{_sysconfdir}/logrotate.d, %{_sysconfdir}/cron.daily
@@ -47,9 +52,10 @@
 # No virtual provides for this
 Requires: perl-Digest-MD5 perl-libwww-perl
 %else
-# Only vitual provides (but not detected) on non RHEL2
+# Only virtual provides (but not detected) on non RHEL2
 Requires:  perl(HTTP::Request)
 %endif
+Requires: ocsinventory-ipdiscover
 
 %description
 Open Computer and Software Inventory Next Generation is an application
@@ -75,12 +81,18 @@
 %prep
 %setup -q -n %{tarname}
 %patch0 -p0 -b .fedora
+
+touch -r changelogs timestamp
 %{__perl} -pi -e 's/\r//' changelogs
+touch -r timestamp changelogs
+touch -r README timestamp
+%{__perl} -pi -e 's/\r//' README
+touch -r timestamp README
 
 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>
@@ -114,7 +126,6 @@
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 popd
-%{__cc} %{optflags} -o ipdiscover ipdiscover.c
 
 %install
 rm -rf %{buildroot}
@@ -127,8 +138,6 @@
 rm %{buildroot}%{perl_vendorlib}/Ocsinventory/ocsinventory-client.pl
 popd
 
-%{__install} -m 755 ipdiscover %{buildroot}%{_sbindir}
-
 %{__mkdir_p} %{buildroot}%{_localstatedir}/log/%{name}
 
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/%{name}
@@ -148,7 +157,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
@@ -160,7 +171,6 @@
 %lang(fr) %doc README.fedora.fr
 %{perl_vendorlib}/Ocsinventory
 %{_sbindir}/ocsinventory-client.pl
-%{_sbindir}/ipdiscover
 %dir %{_localstatedir}/log/%{name}
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/ocsinv.*
@@ -169,6 +179,24 @@
 
 
 %changelog
+* Mon Apr 09 2007 Remi Collet <Fedora at famillecollet.com> 1.01-5
+- replace ExclusiveArch by ExcludeArch
+
+* 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.
+
+* Sun Apr 08 2007 Remi Collet <Fedora at famillecollet.com> 1.01-2
+- switch back ExclusiveArch: i386 x86_64 (no dmidecode on ppc)
+
+* Tue Mar 20 2007 Remi Collet <Fedora at famillecollet.com> 1.01-1
+- update to 1.01
+- change to noarch
+- split and Requires ocsinventory-ipdiscover
+
 * Sun Jan 28 2007 Remi Collet <Fedora at famillecollet.com> 1.0-1
 - update to 1.0 Final
 - add sleep in cron task (time balancing for large network)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-client/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Jan 2007 08:34:19 -0000	1.3
+++ sources	9 Apr 2007 05:47:46 -0000	1.4
@@ -1 +1 @@
-2103290f3dd7e02f9174899d22a2dc3c  OCSNG_LINUX_AGENT_1.0.tar.gz
+9e5a5893cd83eb94637c34b60286dcb8  OCSNG_LINUX_AGENT_1.01.tar.gz