[ocsinventory-ipdiscover] update to 2.0.5

[Remi Collet]

commit 94d026f0ed2a24a17fecfba8a4afd98d3a5646c2
Author: remi <fedora at famillecollet.com>
Date:   Sat Apr 14 08:09:50 2012 +0200

    update to 2.0.5

 .gitignore                    |    1 +
 ocsinventory-ipdiscover.patch |   11 -----------
 ocsinventory-ipdiscover.spec  |   35 +++++++++++++++++++++--------------
 sources                       |    2 +-
 4 files changed, 23 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 116fce4..5652009 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 OCSNG_LINUX_AGENT_1.01.tar.gz
+/Ocsinventory-Unix-Agent-2.0.5.tar.gz
diff --git a/ocsinventory-ipdiscover.spec b/ocsinventory-ipdiscover.spec
index b0a57af..5db78ae 100644
--- a/ocsinventory-ipdiscover.spec
+++ b/ocsinventory-ipdiscover.spec
@@ -1,18 +1,16 @@
-%define tarname OCSNG_LINUX_AGENT_1.01
-
 Name:      ocsinventory-ipdiscover
-Version:   1.01
-Release:   8%{?dist}
+Version:   2.0.5
+Release:   1%{?dist}
 Summary:   Open Computer and Software Inventory Next Generation client
 
 Group:     Development/Libraries
-License:   GPLv2
+License:   GPLv2+
 URL:       http://ocsinventory.sourceforge.net/
-Source0:   http://downloads.sourceforge.net/sourceforge/ocsinventory/%{tarname}.tar.gz
-Patch0:    ocsinventory-ipdiscover.patch
+Source0:   http://launchpad.net/ocsinventory-unix-agent/stable-2.0/%{version}/+download/Ocsinventory-Unix-Agent-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+
 %description
 Open Computer and Software Inventory Next Generation is an application
 designed to help a network or system administrator keep track of computer
@@ -24,6 +22,7 @@ Linux client computers.
 %{name} provide the ipdiscover command used by 
 client agent for Linux.
 
+
 %description -l fr
 Open Computer and Software Inventory Next Generation est une application
 destinée à aider l'administrateur système ou réseau à garder un oeil sur
@@ -36,32 +35,40 @@ de commandes ou de fichiers sur les clients Windows ou Linux.
 %{name} fournit la commande ipdiscover utilisée par 
 le client pour Linux.
 
+
 %prep
-%setup -q -n %{tarname}
-%patch0 -p0
+%setup -q -n Ocsinventory-Unix-Agent-%{version}
+
 touch -r README timestamp
-%{__perl} -pi -e 's/\r//' README
+perl -pi -e 's/\r//' README
 touch -r timestamp README
 
 
 %build
-%{__cc} %{optflags} -o ipdiscover ipdiscover.c
+cd resources/ipdiscover
+gcc %{optflags} -o ipdiscover ipdiscover.c
+
 
 %install
 rm -rf %{buildroot}
-%{__mkdir_p} %{buildroot}%{_sbindir}
-%{__install} -m 755 ipdiscover %{buildroot}%{_sbindir}
+install -D -m 755 resources/ipdiscover/ipdiscover \
+        %{buildroot}%{_sbindir}/ipdiscover
+
 
 %clean
 rm -rf %{buildroot}
 
+
 %files
 %defattr(-, root, root, -)
-%doc README
+%doc AUTHORS Changes LICENSE README THANKS
 %{_sbindir}/ipdiscover
 
 
 %changelog
+* Sat Apr 14 2012 Remi Collet <remi at fedoraproject.org> - 2.0.5-1
+- update to 2.0.5
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.01-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 4eec694..3a1ddf2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9e5a5893cd83eb94637c34b60286dcb8  OCSNG_LINUX_AGENT_1.01.tar.gz
+43fbceeb55c14b71238d4ae0a4124d25  Ocsinventory-Unix-Agent-2.0.5.tar.gz