From 56fdd2f113cbd0e7d43447559a15fd7e3e8b389e Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Mon, 16 Apr 2012 09:51:39 +0200
Subject: fusioninventory-agent: revert to previous behavior for software list

---
 fusioninventory-agent-arch.patch | 12 ++++++++++++
 fusioninventory-agent.spec       | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 fusioninventory-agent-arch.patch

diff --git a/fusioninventory-agent-arch.patch b/fusioninventory-agent-arch.patch
new file mode 100644
index 0000000..a882db6
--- /dev/null
+++ b/fusioninventory-agent-arch.patch
@@ -0,0 +1,12 @@
+diff -up FusionInventory-Agent-2.2.0/lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Softwares/RPM.pm.orig FusionInventory-Agent-2.2.0/lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Softwares/RPM.pm
+--- FusionInventory-Agent-2.2.0/lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Softwares/RPM.pm.orig	2012-04-16 09:33:21.000000000 +0200
++++ FusionInventory-Agent-2.2.0/lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Softwares/RPM.pm	2012-04-16 09:33:32.000000000 +0200
+@@ -17,7 +17,7 @@ sub doInventory {
+ 
+     my $command =
+         'rpm -qa --queryformat \'' .
+-        '%{NAME}\t' .
++        '%{NAME}.%{ARCH}\t' .
+         '%{VERSION}-%{RELEASE}\t' .
+         '%{INSTALLTIME:date}\t' .
+         '%{SIZE}\t' .
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 4a9531c..4b80ec9 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -22,7 +22,7 @@ Release:   0.2.git%{gitver}%{?dist}
 # From http://github.com/fusinv/fusioninventory-agent/tarball/master
 Source0:   fusinv-fusioninventory-agent-2.1.8-95-g9bd1238.tar.gz
 %else
-Release:   1%{?dist}
+Release:   2%{?dist}
 Source0:   http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 %endif
 
@@ -30,6 +30,11 @@ Source1:   %{name}.cron
 Source2:   %{name}.init
 Source3:   %{name}.service
 
+# See http://forge.fusioninventory.org/issues/1581
+# Upstream desagree on this patch, but it will avoid behavior change
+# until managed properly, as part of the XML file
+Patch0:    %{name}-arch.patch
+
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -158,6 +163,8 @@ Le service doit être actif et lancé avec l'option --rpc-trust-localhost.
 %setup -q -n FusionInventory-Agent-%{version}%{?prever}
 %endif
 
+%patch0 -p1 -b .rpmarch
+
 # This work only on older version, and is ignored on recent
 cat <<EOF | tee %{name}-req
 #!/bin/sh
@@ -326,6 +333,10 @@ exit 0
 
 
 %changelog
+* Mon Apr 16 2012 Remi Collet <remi@fedoraproject.org> - 2.2.0-2
+- revert change in 2.2.0: don't loose arch information
+  see http://forge.fusioninventory.org/issues/1581
+
 * Sat Apr 14 2012 Remi Collet <remi@fedoraproject.org> - 2.2.0-1
 - update to 2.2.0
   http://search.cpan.org/src/FUSINV/FusionInventory-Agent-2.2.0/Changes
-- 
cgit