From 7ad1ba98d13f3f21a69211aa833c02757c26d500 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <rpm@greysector.net>
Date: Nov 21 2016 12:34:44 +0000
Subject: EL7 has gnome-software, so ship appstream data there, too


---

diff --git a/mozilla-https-everywhere.spec b/mozilla-https-everywhere.spec
index 1bcac4d..ba82229 100644
--- a/mozilla-https-everywhere.spec
+++ b/mozilla-https-everywhere.spec
@@ -9,7 +9,7 @@
 
 Name:           mozilla-https-everywhere
 Version:        5.2.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        HTTPS/HSTS enforcement extension for Mozilla Firefox and SeaMonkey
 
 Group:          Applications/Internet
@@ -26,8 +26,8 @@ Requires:       firefox >= 26
 %else
 Requires:       mozilla-filesystem
 %endif
-# GNOME Software Center not present on EL systems and Fedora < 21
-%if 0%{?fedora}
+# GNOME Software Center not present on EL < 7 and Fedora
+%if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires:  libappstream-glib
 %endif
 BuildArch:      noarch
@@ -60,9 +60,8 @@ mkdir -p %{buildroot}%{seamonkey_inst_dir}
 ln -s %{firefox_inst_dir}/%{src_ext_id}.xpi %{buildroot}%{seamonkey_inst_dir}
 
 
-# if Fedora >= 21
 # install MetaInfo file for firefox, etc
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
 appstream-util validate-relax %{SOURCE1}
 DESTDIR=%{buildroot} appstream-util install %{SOURCE1}
 %endif
@@ -71,12 +70,15 @@ DESTDIR=%{buildroot} appstream-util install %{SOURCE1}
 %{firefox_inst_dir}/%{src_ext_id}.xpi
 %{seamonkey_inst_dir}/%{src_ext_id}.xpi
 # GNOME Software Center metadata
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
 %{_datadir}/appdata/%{name}.metainfo.xml
 %endif
 
 
 %changelog
+* Mon Nov 21 2016 Dominik Mierzejewski <rpm@greysector.net> - 5.2.7-2
+- EL7 has gnome-software, so ship appstream data there, too
+
 * Sat Nov 19 2016 Dominik Mierzejewski <rpm@greysector.net> - 5.2.7-1
 - update to 5.2.7
 - validate appstream data