rpms/ocsinventory-agent/F-11 ocsinventory-agent-options.patch, 1.4, 1.5 ocsinventory-agent.spec, 1.12, 1.13 sources, 1.7, 1.8

[Remi Collet]

Author: remi

Update of /cvs/pkgs/rpms/ocsinventory-agent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1217

Modified Files:
	ocsinventory-agent-options.patch ocsinventory-agent.spec 
	sources 
Log Message:
update to 1.1.1 (bugfix)

ocsinventory-agent-options.patch:
 Ocsinventory-Agent-1.1.1/lib/Ocsinventory/Agent.pm      |    7 +++++++
 Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent/Config.pm |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

Index: ocsinventory-agent-options.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/F-11/ocsinventory-agent-options.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ocsinventory-agent-options.patch	7 Nov 2009 15:25:41 -0000	1.4
+++ ocsinventory-agent-options.patch	22 Dec 2009 19:17:02 -0000	1.5
@@ -10,10 +10,9 @@ diff -up Ocsinventory-Agent-1.1/lib/Ocsi
  		"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/Ocsi
 +
  # 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");


Index: ocsinventory-agent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/F-11/ocsinventory-agent.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ocsinventory-agent.spec	7 Nov 2009 15:25:41 -0000	1.12
+++ ocsinventory-agent.spec	22 Dec 2009 19:17:02 -0000	1.13
@@ -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 at famillecollet.com> 1.1.1-1
+- update to 1.1.1
+
 * Sat Nov 07 2009 Remi Collet <Fedora at famillecollet.com> 1.1-1
 - update to 1.1
 - add missing modules.conf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Nov 2009 15:25:41 -0000	1.7
+++ sources	22 Dec 2009 19:17:02 -0000	1.8
@@ -1 +1 @@
-591158c3691cb56c6817e3e86fda2523  Ocsinventory-Agent-1.1.tar.gz
+c00acb51f559b237590ea7611523da0b  Ocsinventory-Agent-1.1.1.tar.gz