rpms/ocsinventory-agent/F-10 ocsinventory-agent-options.patch, 1.3, 1.4 ocsinventory-agent.cron, 1.1, 1.2 ocsinventory-agent.spec, 1.9, 1.10 sources, 1.6, 1.7

[Remi Collet]

Author: remi

Update of /cvs/extras/rpms/ocsinventory-agent/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18961

Modified Files:
	ocsinventory-agent-options.patch ocsinventory-agent.cron 
	ocsinventory-agent.spec sources 
Log Message:
update to 1.1

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

Index: ocsinventory-agent-options.patch
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/F-10/ocsinventory-agent-options.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ocsinventory-agent-options.patch	29 Mar 2009 09:08:59 -0000	1.3
+++ ocsinventory-agent-options.patch	7 Nov 2009 15:33:45 -0000	1.4
@@ -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");


Index: ocsinventory-agent.cron
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/F-10/ocsinventory-agent.cron,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ocsinventory-agent.cron	8 Mar 2008 20:09:11 -0000	1.1
+++ ocsinventory-agent.cron	7 Nov 2009 15:33:45 -0000	1.2
@@ -5,6 +5,7 @@ exec >>/var/log/$NAME/$NAME.log 2>&1 
 
 [ -f   /etc/sysconfig/$NAME ] || exit 0
 source /etc/sysconfig/$NAME
+export PATH
 
 i=0
 while [ $i -lt ${#OCSMODE[*]} ]
@@ -26,10 +27,10 @@ do
 	        	# Remote inventory
 		        OPTS="$OPTS --lazy --server=${OCSSERVER[$i]}"	
 		fi
-		echo "[$(date '+%D %T')]" Running $NAME $OPTS
+		echo "[$(date '+%c')] Running $NAME $OPTS"
 		/usr/sbin/$NAME  $OPTS
 	fi
 	((i++))
 done
-echo "[$(date '+%D %T')]" End of cron job
+echo "[$(date '+%c')] End of cron job ($PATH)"
 


Index: ocsinventory-agent.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/F-10/ocsinventory-agent.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ocsinventory-agent.spec	29 Mar 2009 09:08:59 -0000	1.9
+++ ocsinventory-agent.spec	7 Nov 2009 15:33:45 -0000	1.10
@@ -5,11 +5,12 @@
 Name:      ocsinventory-agent
 Summary:   Open Computer and Software Inventory Next Generation client
 
-Version:   1.0.1
+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(Fi
 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,13 +71,17 @@ de commandes ou de fichiers sur les clie
 %prep
 %setup -q -n Ocsinventory-Agent-%{version}
 
-%patch1 -p0
+%patch1 -p1
 
 cat <<EOF >%{name}.conf
 # 
 # OCS Inventory "Unix Unified Agent" Configuration File
 # used by hourly cron job
 #
+
+# Add tools directory if needed (tw_cli, hpacucli, ipssend, ...)
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
 %if 0%{?ocsserver:1}
 # Mode, change to "none" to disable
 OCSMODE[0]=cron
@@ -89,7 +93,7 @@ OCSMODE[0]=none
 %endif
 
 # can be used to override the %{name}.cfg setup.
-# OCSSERVER[0]=http://your.ocsserver.name/ocsinventory
+# OCSSERVER[0]=your.ocsserver.name
 # 
 # corresponds with --local=%{_localstatedir}/lib/%{name}
 # OCSSERVER[0]=local
@@ -112,7 +116,7 @@ cat <<EOF >%{name}.cfg
 server = http://%{ocsserver}/ocsinventory
 %else
 # Server URL, unconmment if needed
-# server = http://your.ocsserver.name/ocsinventory
+# server = your.ocsserver.name
 local = %{_localstatedir}/lib/%{name}
 %endif
 
@@ -158,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*
@@ -181,18 +186,23 @@ 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 <Fedora at famillecollet.com> 1.1-1
+- update to 1.1
+- add missing modules.conf
+- new Requires perl(Net::SSLeay), perl(Crypt::SSLeay), smartmontools
+- download URL to launchpad
+
 * Sun Mar 29 2009 Remi Collet <Fedora at famillecollet.com> 1.0.1-1
 - update to 1.0.1
 
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.9.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Wed Oct 20 2008 Remi Collet <Fedora at famillecollet.com> 0.0.9.2-2
 - fix FTBFS (#465073)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	29 Mar 2009 09:08:59 -0000	1.6
+++ sources	7 Nov 2009 15:33:45 -0000	1.7
@@ -1 +1 @@
-749501586e0c634680c13000b3b2851e  Ocsinventory-Agent-1.0.1.tar.gz
+591158c3691cb56c6817e3e86fda2523  Ocsinventory-Agent-1.1.tar.gz