From 8539979faf116f1b8f60daea713f2650df866b8c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Nov 07 2009 15:25:41 +0000 Subject: update to 1.1 --- diff --git a/ocsinventory-agent-options.patch b/ocsinventory-agent-options.patch index 2b2880e..ff15f54 100644 --- a/ocsinventory-agent-options.patch +++ b/ocsinventory-agent-options.patch @@ -1,24 +1,29 @@ ---- ocsinventory-agent.orig 2008-10-14 19:51:48.000000000 +0200 -+++ ocsinventory-agent 2008-10-20 21:59:57.000000000 +0200 -@@ -88,7 +88,7 @@ - "p|password=s" => \$params->{password}, - "r|realm=s" => \$params->{realm}, - "R|remotedir=s" => \$params->{remotedir}, -- "s|server=s" => \$params->{server}, -+ "s|server=s" => \$params->{optserver}, - "stdout" => \$params->{stdout}, - "t|tag=s" => \$params->{tag}, - "u|user=s" => \$params->{user}, -@@ -226,6 +226,12 @@ - $params->{nosoftware} = 1 - } +diff -up Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent/Config.pm.orig Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent/Config.pm +--- Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent/Config.pm.orig 2009-11-06 16:17:45.000000000 +0100 ++++ Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent/Config.pm 2009-11-07 12:21:40.000000000 +0100 +@@ -125,7 +125,7 @@ sub loadUserParams { + "P|proxy=s" => \$self->{config}{proxy}, + "r|realm=s" => \$self->{config}{realm}, + "R|remotedir=s" => \$self->{config}{remotedir}, +- "s|server=s" => \$self->{config}{server}, ++ "s|server=s" => \$self->{config}{optserver}, + "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 { + $config->{config}{nosoftware} = 1 + } +# allow "server" from command line when "local" in config. file -+if (defined($params->{optserver})) { -+ $params->{server}=$params->{optserver}; -+ undef $params->{local}; -+ undef $params->{optserver}; ++if (defined($config->{config}{'optserver'})) { ++ $config->{config}{'server'}=$config->{config}{'optserver'}; ++ undef $config->{config}{'local'}; ++ undef $config->{config}{'optserver'}; +} - - if (!$params->{'stdout'} && !$params->{'local'} && $params->{server} !~ /^http(|s):\/\//) { - $logger->debug("the --server passed doesn't have a protocle, assume http as default"); ++ + # 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"); diff --git a/ocsinventory-agent.spec b/ocsinventory-agent.spec index efd9a80..9ce3e5b 100644 --- a/ocsinventory-agent.spec +++ b/ocsinventory-agent.spec @@ -5,11 +5,12 @@ Name: ocsinventory-agent Summary: Open Computer and Software Inventory Next Generation client -Version: 1.0.1 -Release: 4%{?dist}%{?ocstag:.%{ocstag}} +Version: 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://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 Source1: %{name}.logrotate Source2: %{name}.cron @@ -20,7 +21,7 @@ Source12: %{name}.README.fr Patch1: %{name}-options.patch Group: Development/Libraries -License: GPLv2 +License: GPLv2+ URL: http://www.ocsinventory-ng.org/ BuildArch: noarch @@ -31,14 +32,13 @@ BuildRequires: perl(Digest::MD5) perl(File::Temp) perl(XML::SAX) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: net-tools, pciutils Requires: %{_sysconfdir}/logrotate.d, %{_sysconfdir}/cron.hourly -Requires: perl(HTTP::Request) -Requires: perl(Proc::Daemon) -Requires: nmap -Requires: monitor-edid +Requires: perl(HTTP::Request) perl(Proc::Daemon) +Requires: perl(Net::SSLeay) perl(Crypt::SSLeay) +Requires: nmap monitor-edid smartmontools # Optionnal : dmidecode on x86, /proc in ppc # Requires: %{_sbindir}/dmidecode # Optionnal : ipdiscover or nmap, monitor-edid -# Requires: ocsinventory-ipdiscover, nmap, monitor-edid +# Requires: ocsinventory-ipdiscover, nmap, monitor-edid, bridge-utils Obsoletes: ocsinventory-client <= 1.01 Provides: ocsinventory-client = 1.02 # use the following line when version is strictly above 1.01 @@ -71,7 +71,7 @@ de commandes ou de fichiers sur les clients Windows ou Linux. %prep %setup -q -n Ocsinventory-Agent-%{version} -%patch1 -p0 +%patch1 -p1 cat <%{name}.conf # @@ -162,6 +162,7 @@ sed -e 's;/etc/;%{_sysconfdir}/;' \ chmod +x %{buildroot}%{_sysconfdir}/cron.hourly/%{name} %{__install} -m 644 %{name}.cfg %{buildroot}%{_sysconfdir}/ocsinventory/%{name}.cfg +%{__install} -m 644 etc/ocsinventory-agent/modules.conf %{buildroot}%{_sysconfdir}/ocsinventory/modules.conf # Remove some unusefull files (which brings unresolvable deps) rm -rf %{buildroot}%{perl_vendorlib}/Ocsinventory/Agent/Backend/OS/Win32* @@ -185,12 +186,20 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/ocsinventory %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %config(noreplace) %{_sysconfdir}/ocsinventory/%{name}.cfg +%config(noreplace) %{_sysconfdir}/ocsinventory/modules.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %{_sysconfdir}/cron.hourly/%{name} -%{_mandir}/man1/%{name}.* +%{_mandir}/man1/%{name}* +%{_mandir}/man3/Ocs* %changelog +* Sat Nov 07 2009 Remi Collet 1.1-1 +- update to 1.1 +- add missing modules.conf +- new Requires perl(Net::SSLeay), perl(Crypt::SSLeay), smartmontools +- download URL to launchpad + * Thu May 14 2009 Remi Collet 1.0.1-4 - fix typo diff --git a/sources b/sources index f6c79c3..47887f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -749501586e0c634680c13000b3b2851e Ocsinventory-Agent-1.0.1.tar.gz +591158c3691cb56c6817e3e86fda2523 Ocsinventory-Agent-1.1.tar.gz