[ocsinventory-agent/f17] fix ifconfig output parser (#853982)

[Remi Collet]

commit 81a48b27e4466e1e72dd1cbdf6a7269221afe38f
Author: Remi Collet <remi at fedoraproject.org>
Date:   Sun Sep 23 19:18:29 2012 +0200

    fix ifconfig output parser (#853982)

 ocsinventory-agent.spec |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/ocsinventory-agent.spec b/ocsinventory-agent.spec
index f9c632b..7f715be 100644
--- a/ocsinventory-agent.spec
+++ b/ocsinventory-agent.spec
@@ -6,7 +6,7 @@ Name:      ocsinventory-agent
 Summary:   Open Computer and Software Inventory Next Generation client
 
 Version:   2.0.5
-Release:   1%{?dist}%{?ocstag:.%{ocstag}}
+Release:   4%{?dist}%{?ocstag:.%{ocstag}}
 
 Source0:   http://launchpad.net/ocsinventory-unix-agent/stable-2.0/%{version}/+download/Ocsinventory-Unix-Agent-%{version}.tar.gz
 
@@ -16,6 +16,14 @@ Source2:   %{name}.cron
 Source11:   %{name}.README
 Source12:   %{name}.README.fr
 
+# Fix ifconfig output parsing on fedora >= 17 #853982
+# https://bugs.launchpad.net/bugs/1045356
+# http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-unix-agent/trunk/revision/1112
+# http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-unix-agent/trunk/revision/1123
+# http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-unix-agent/trunk/revision/1133
+# http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-unix-agent/trunk/revision/1134
+Patch0:     %{name}-ifconfig.patch
+
 Group:     Development/Libraries
 License:   GPLv2+
 URL:       http://www.ocsinventory-ng.org/
@@ -23,9 +31,7 @@ URL:       http://www.ocsinventory-ng.org/
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if 0%{?rhel} != 3
 BuildRequires: perl(Module::Install)
-%endif
 BuildRequires: perl(XML::Simple) perl(LWP) perl(Net::IP)
 BuildRequires: perl(Digest::MD5) perl(File::Temp)
 
@@ -35,16 +41,8 @@ Requires:  %{_sysconfdir}/logrotate.d, %{_sysconfdir}/cron.hourly
 Requires:  perl(HTTP::Request)
 Requires:  perl(Net::SSLeay) perl(Crypt::SSLeay) perl(Net::IP)
 Requires:  nmap monitor-edid which
-%if 0%{?rhel} == 3
-Requires:  perl(XML::Parser)
-%else
 Requires:  perl(Proc::Daemon)
-%endif
-%if 0%{?rhel}%{?fedora} <= 4
-Requires:  kernel-utils
-%else
 Requires:  smartmontools
-%endif
 # Optionnal : dmidecode on x86, /proc in ppc
 # Requires:  %{_sbindir}/dmidecode
 # Optionnal : ipdiscover or nmap, monitor-edid
@@ -52,10 +50,6 @@ Requires:  smartmontools
 Obsoletes: ocsinventory-client <= 1.01
 Provides:  ocsinventory-client  = %{version}-%{release}
 
-%if 0%{?rhel} == 3
-%define perl_vendorlib  %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
-%endif
-
 %{?perl_default_filter}
 
 
@@ -85,6 +79,8 @@ de commandes ou de fichiers sur les clients Windows ou Linux.
 %prep
 %setup -q -n Ocsinventory-Unix-Agent-%{version}
 
+%patch0 -p0
+
 # avoid rpmlint warning
 sed -i -e 's/\r//' lib/Ocsinventory/Agent/Modules/Download.pm
 
@@ -219,6 +215,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 23 2012 Remi Collet <remi at fedoraproject.org> - 2.0.5-4
+- fix ifconfig output parser (#853982)
+  https://bugs.launchpad.net/bugs/1045356
+
 * Sat Apr 14 2012 Remi Collet <remi at fedoraproject.org> - 2.0.5-1
 - update to 2.0.5