rpms/ocsinventory-agent/devel ocsinventory-agent-options.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 ocsinventory-agent.spec, 1.3, 1.4 sources, 1.2, 1.3

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/ocsinventory-agent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11794

Modified Files:
	.cvsignore ocsinventory-agent.spec sources 
Added Files:
	ocsinventory-agent-options.patch 
Log Message:
update to finale version

ocsinventory-agent-options.patch:

--- NEW FILE ocsinventory-agent-options.patch ---
--- ocsinventory-agent.orig	2008-04-02 20:27:42.000000000 +0200
+++ ocsinventory-agent	2008-04-02 20:29:12.000000000 +0200
@@ -86,7 +86,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},
@@ -215,6 +215,13 @@
     $params->{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 ($params->{server} !~ /^http(|s):\/\//) {
     $logger->debug("the --server passed doesn't have a protocle, assume http as default");
     $params->{server} = "http://".$params->{server}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Mar 2008 20:09:11 -0000	1.2
+++ .cvsignore	2 Apr 2008 19:10:20 -0000	1.3
@@ -1 +1 @@
-Ocsinventory-Agent-cvs.tgz
+Ocsinventory-Agent-0.0.9.tar.gz


Index: ocsinventory-agent.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/devel/ocsinventory-agent.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocsinventory-agent.spec	10 Mar 2008 17:13:48 -0000	1.3
+++ ocsinventory-agent.spec	2 Apr 2008 19:10:20 -0000	1.4
@@ -3,17 +3,12 @@
 # - ocsserver : OCS Inventory NG communication serveur
 
 Name:      ocsinventory-agent
-Version:   0.0.8.2
 Summary:   Open Computer and Software Inventory Next Generation client
 
-#Release:   1%{?dist}%{?ocstag:.%{ocstag}}
-#Source0:   http://nana.rulezlan.org/~goneri/ocsinventory-agent/Ocsinventory-Agent-%{version}.tar.gz
-#Source0:   http://search.cpan.org/CPAN/authors/id/G/GO/GONERI/Ocsinventory-Agent-%{version}.tar.gz
-
-# cvs -z3 -d:pserver:anonymous at ocsinventory.cvs.sourceforge.net:/cvsroot/ocsinventory co  -D "2008-03-05" -P unified_unix_agent
-# tar cvzf Ocsinventory-Agent-cvs.tgz --exclude CVS unified_unix_agent
-Release:   0.6.20080305%{?dist}%{?ocstag:.%{ocstag}}
-Source0:   Ocsinventory-Agent-cvs.tgz
+Version:   0.0.9
+Release:   1%{?dist}%{?ocstag:.%{ocstag}}
+
+Source0:   http://search.cpan.org/CPAN/authors/id/G/GO/GONERI/Ocsinventory-Agent-%{version}.tar.gz
 
 Source1:   %{name}.logrotate
 Source2:   %{name}.cron
@@ -21,6 +16,8 @@
 Source11:   %{name}.README
 Source12:   %{name}.README.fr
 
+Patch1:    %{name}-options.patch
+
 Group:     Development/Libraries
 License:   GPLv2
 URL:       http://www.ocsinventory-ng.org/
@@ -28,12 +25,14 @@
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: perl(Module::Install) perl(XML::Simple) perl(LWP) perl(Net::IP) perl(Digest::MD5) perl(File::Temp)
+BuildRequires: perl(Module::Install) perl(XML::Simple) perl(LWP) perl(Net::IP)
+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
 # Optionnal : dmidecode on x86, /proc in ppc
 # Requires:  %{_sbindir}/dmidecode
 # Optionnal : ipdiscover or nmap, monitor-edid not available on Fedora
@@ -68,8 +67,9 @@
 
 
 %prep
-#%setup -q -n Ocsinventory-Agent-%{version}
-%setup -q -n unified_unix_agent
+%setup -q -n Ocsinventory-Agent-%{version}
+
+%patch1 -p0
 
 cat <<EOF >%{name}.conf
 # 
@@ -111,6 +111,7 @@
 %else
 # Server URL, unconmment if needed
 # server = http://your.ocsserver.name/ocsinventory
+local = %{_localstatedir}/lib/%{name}
 %endif
 
 # Administrative TAG (optional, must be filed before first inventory)
@@ -184,6 +185,12 @@
 
 
 %changelog
+* Wed Apr 02 2008 Remi Collet <Fedora at famillecollet.com> 0.0.9-1
+- update to 0.0.9 finale
+- provides default config to file (need options.patch)
+- add requires nmap (for ipdiscover)
+- add BR perl(XML::SAX) (to avoid install of bundled one)
+
 * Mon Mar 10 2008 Remi Collet <Fedora at famillecollet.com> 0.0.8.2-0.6.20080305
 - rebuild against perl 5.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Mar 2008 20:09:11 -0000	1.2
+++ sources	2 Apr 2008 19:10:20 -0000	1.3
@@ -1 +1 @@
-13152620c60690d563c318097800c04a  Ocsinventory-Agent-cvs.tgz
+ddc67559af8c318eadaaddddcd179c3d  Ocsinventory-Agent-0.0.9.tar.gz