From c2d41c308b66865784f79745ff7c8f45f52df017174ef0e48792ba0b4220cd0e Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 20 Sep 2016 12:57:35 +0000
Subject: [PATCH] Accepting request 428684 from GNOME:Next

- Update openSUSE-appstream-process: do not rename the various
  appstream files to contain the sha hash in their filename: zypp
  is not (yet) able to cope with this (boo#999047).

OBS-URL: https://build.opensuse.org/request/show/428684
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/appstream-glib?expand=0&rev=83
---
 appstream-glib.changes     |  7 +++++++
 openSUSE-appstream-process | 26 +++++++++++++++-----------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/appstream-glib.changes b/appstream-glib.changes
index 1223a5a..4cf4930 100644
--- a/appstream-glib.changes
+++ b/appstream-glib.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Sep 19 12:44:38 UTC 2016 - dimstar@opensuse.org
+
+- Update openSUSE-appstream-process: do not rename the various
+  appstream files to contain the sha hash in their filename: zypp
+  is not (yet) able to cope with this (boo#999047).
+
 -------------------------------------------------------------------
 Sun Sep 11 09:50:57 UTC 2016 - zaitor@opensuse.org
 
diff --git a/openSUSE-appstream-process b/openSUSE-appstream-process
index 7aa7d40..c642e9b 100644
--- a/openSUSE-appstream-process
+++ b/openSUSE-appstream-process
@@ -6,6 +6,7 @@ URL=https://static.opensuse.org/appstream/tumbleweed
 # Do not produce the html files - the biggest tasks are done
 # Users interested in them can always produce them locally out of the appdata.xml.gz file
 HTMLOUT=no
+HASHED_NAMES=no
 
 TMPDIR=$(mktemp -d)
 
@@ -46,16 +47,19 @@ if [ "$HTMLOUT" = "yes" ]; then
   xz -9 ${DEST}/appdata-failed.html
 fi
 
-# rename the appdata-icons.tar.gz tarball to something like
-# appdata-icons-${hash}.tar.gz, allowing mirrorbrain to send users
-# off to a mirror to catch the file, improving performance
-read md5 fn_catchall <<<$(md5sum ${DEST}/appdata-icons.tar.gz)
-mv ${DEST}/appdata-icons.tar.gz ${DEST}/appdata-icons-${md5}.tar.gz
 
-# also rename the appdata.xml.gz file in the same style
-read md5 fn_catchall <<<$(md5sum ${DEST}/appdata.xml.gz)
-mv ${DEST}/appdata.xml.gz ${DEST}/appdata-${md5}.xml.gz
+if [ "$HASHED_NAMES" = "yes" ]; then
+  # rename the appdata-icons.tar.gz tarball to something like
+  # appdata-icons-${hash}.tar.gz, allowing mirrorbrain to send users
+  # off to a mirror to catch the file, improving performance
+  read md5 fn_catchall <<<$(md5sum ${DEST}/appdata-icons.tar.gz)
+  mv ${DEST}/appdata-icons.tar.gz ${DEST}/appdata-icons-${md5}.tar.gz
 
-# And the same for the -screenshots tarball (containing auto-generated screenshots for fonts)
-read md5 fn_catchall <<<$(md5sum ${DEST}/appdata-screenshots.tar)
-mv ${DEST}/appdata-screenshots.tar ${DEST}/appdata-screenshots-${md5}.tar
+  # also rename the appdata.xml.gz file in the same style
+  read md5 fn_catchall <<<$(md5sum ${DEST}/appdata.xml.gz)
+  mv ${DEST}/appdata.xml.gz ${DEST}/appdata-${md5}.xml.gz
+
+  # And the same for the -screenshots tarball (containing auto-generated screenshots for fonts)
+  read md5 fn_catchall <<<$(md5sum ${DEST}/appdata-screenshots.tar)
+  mv ${DEST}/appdata-screenshots.tar ${DEST}/appdata-screenshots-${md5}.tar
+fi