From c40776b61652df3fb371c31b834859641e0a94acce684877e3065ea00ca534a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <zaitor@opensuse.org>
Date: Fri, 15 Jul 2016 08:36:45 +0000
Subject: [PATCH] Accepting request 408627 from GNOME:Next

- InstallAppdata.sh: do not stumble over the presence of the
  appdata-failed.xml.gz file: this is for debug purpose and does
  not contain valid applications (boo#989031).
- Add awk Requires, as the latest modification relies on awk to
  find the right filenames.

OBS-URL: https://build.opensuse.org/request/show/408627
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libzypp-plugin-appdata?expand=0&rev=30
---
 InstallAppdata.sh              | 4 +++-
 libzypp-plugin-appdata.changes | 9 +++++++++
 libzypp-plugin-appdata.spec    | 2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/InstallAppdata.sh b/InstallAppdata.sh
index 6e10643..bbb23e6 100644
--- a/InstallAppdata.sh
+++ b/InstallAppdata.sh
@@ -43,7 +43,9 @@ while ([ "$1" = "-R" ]); do
     yast2)
       # We do not validate an appdata.xml.gz in a yast2 repo: those are created by appstream-builder, and we can trust them
       #if appstream-util validate-relax --nonet "$6$YAST2/appdata.xml.gz" 2>&1 > /dev/null; then
-        appstream-util install-origin "$2" "$6$YAST2/"appdata*.xml.gz "$6$YAST2/"appdata-icons*.tar.gz 2>&1 > /dev/null
+      # get the real appdata.xml.gz file name out of content
+      APPDATA=$(awk '/appdata.*xml.gz/ && !/failed/ {print $4}' "$6/content")
+        appstream-util install-origin "$2" "$6$YAST2/${APPDATA}" "$6$YAST2/"appdata-icons*.tar.gz 2>&1 > /dev/null
       #fi
       ;;
     *)
diff --git a/libzypp-plugin-appdata.changes b/libzypp-plugin-appdata.changes
index d572feb..b8e7cd9 100644
--- a/libzypp-plugin-appdata.changes
+++ b/libzypp-plugin-appdata.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Jul 15 07:25:08 UTC 2016 - dimstar@opensuse.org
+
+- InstallAppdata.sh: do not stumble over the presence of the
+  appdata-failed.xml.gz file: this is for debug purpose and does
+  not contain valid applications (boo#989031).
+- Add awk Requires, as the latest modification relies on awk to
+  find the right filenames.
+
 -------------------------------------------------------------------
 Tue May  3 14:13:12 UTC 2016 - dimstar@opensuse.org
 
diff --git a/libzypp-plugin-appdata.spec b/libzypp-plugin-appdata.spec
index 189f7ca..2beac83 100644
--- a/libzypp-plugin-appdata.spec
+++ b/libzypp-plugin-appdata.spec
@@ -32,6 +32,8 @@ Requires:       appstream-glib >= 0.3.6
 Requires:       libzypp >= 14.29.4
 # appstreamcli is provided by the AppStream package
 Requires:       AppStream
+# The script uses awk to find the right filename for the appdata.xml.gz file
+Requires:       awk
 
 %description
 This plugin extends libzypp to install AppStream metadata, as extracted from the