From 69261ff3bcf45ecb95c99015dc9a8da69e6c04c1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Dec 22 2009 19:17:02 +0000
Subject: update to 1.1.1 (bugfix)


---

diff --git a/ocsinventory-agent-options.patch b/ocsinventory-agent-options.patch
index ff15f54..a575e14 100644
--- a/ocsinventory-agent-options.patch
+++ b/ocsinventory-agent-options.patch
@@ -10,10 +10,9 @@ diff -up Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent/Config.pm.orig Ocsinvento
  		"stdout"          =>   \$self->{config}{stdout},
  		"t|tag=s"         =>   \$self->{config}{tag},
  		"u|user=s"        =>   \$self->{config}{user},
-diff -up Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm.orig Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm
---- Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm.orig	2009-11-06 16:17:45.000000000 +0100
-+++ Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm	2009-11-07 12:21:40.000000000 +0100
-@@ -134,6 +134,13 @@ sub run {
+--- Ocsinventory-Agent-1.1.1/lib/Ocsinventory/Agent.pm.orig	2009-12-22 19:42:45.000000000 +0100
++++ Ocsinventory-Agent-1.1.1/lib/Ocsinventory/Agent.pm	2009-12-22 19:43:37.000000000 +0100
+@@ -134,6 +134,13 @@
          $config->{config}{nosoftware} = 1
      }
  
@@ -26,4 +25,4 @@ diff -up Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm.orig Ocsinventory-Agen
 +
  # TODO put that in Ocsinventory::Agent::Config
      if (!$config->{config}{'stdout'} && !$config->{config}{'local'} && $config->{config}{server} !~ /^http(|s):\/\//) {
-         $logger->debug("the --server passed doesn't have a protocle, assume http as default");
+         $logger->debug("the --server passed doesn't have a protocol, assume http as default");
diff --git a/ocsinventory-agent.spec b/ocsinventory-agent.spec
index 9ce3e5b..15af57d 100644
--- a/ocsinventory-agent.spec
+++ b/ocsinventory-agent.spec
@@ -5,12 +5,12 @@
 Name:      ocsinventory-agent
 Summary:   Open Computer and Software Inventory Next Generation client
 
-Version:   1.1
+Version:   1.1.1
 Release:   1%{?dist}%{?ocstag:.%{ocstag}}
 
 #Source0:  http://search.cpan.org/CPAN/authors/id/G/GO/GONERI/Ocsinventory-Agent-%{version}.tar.gz
 #Source0:  http://nana.rulezlan.org/~goneri/ocsinventory-agent/Ocsinventory-Agent-nobundle-%{version}.tar.gz
-Source0:   http://launchpad.net/ocsinventory-unix-agent/trunk/ocsinventory-unix-agent-1.1/+download/Ocsinventory-Agent-%{version}.tar.gz
+Source0:   http://launchpad.net/ocsinventory-unix-agent/1.1.x/ocsinventory-unix-agent-%{version}/+download/Ocsinventory-Agent-%{version}.tar.gz
 
 Source1:   %{name}.logrotate
 Source2:   %{name}.cron
@@ -34,7 +34,12 @@ Requires:  net-tools, pciutils
 Requires:  %{_sysconfdir}/logrotate.d, %{_sysconfdir}/cron.hourly
 Requires:  perl(HTTP::Request) perl(Proc::Daemon)
 Requires:  perl(Net::SSLeay) perl(Crypt::SSLeay)
-Requires:  nmap monitor-edid smartmontools
+Requires:  nmap monitor-edid which
+%if 0%{?rhel} == 4
+Requires:  kernel-utils
+%else
+Requires:  smartmontools
+%endif
 # Optionnal : dmidecode on x86, /proc in ppc
 # Requires:  %{_sbindir}/dmidecode
 # Optionnal : ipdiscover or nmap, monitor-edid
@@ -194,6 +199,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 22 2009 Remi Collet <Fedora@famillecollet.com> 1.1.1-1
+- update to 1.1.1
+
 * Sat Nov 07 2009 Remi Collet <Fedora@famillecollet.com> 1.1-1
 - update to 1.1
 - add missing modules.conf
diff --git a/sources b/sources
index 47887f6..96a64f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-591158c3691cb56c6817e3e86fda2523  Ocsinventory-Agent-1.1.tar.gz
+c00acb51f559b237590ea7611523da0b  Ocsinventory-Agent-1.1.1.tar.gz