[mozilla-https-everywhere/f21: 8/8] merge rawhide spec changes

[Russell William Golden]

commit 1947919d401c280fe600facfc680c827f1b2b88a
Merge: f16793e 0c3eb63
Author: Russell Golden <niveusluna at niveusluna.org>
Date:   Sat Sep 13 10:56:07 2014 -0500

    merge rawhide spec changes

 .gitignore                    |    1 +
 appManaged.patch              |   17 +++++++++--------
 mozilla-https-everywhere.spec |   28 +++++++++++++++++++++++++---
 sources                       |    2 +-
 4 files changed, 36 insertions(+), 12 deletions(-)
---
diff --cc mozilla-https-everywhere.spec
index 15d017d,c94a038..de8ce27
--- a/mozilla-https-everywhere.spec
+++ b/mozilla-https-everywhere.spec
@@@ -69,8 -74,12 +75,11 @@@ don
  mkdir -p %{buildroot}%{seamonkey_inst_dir}
  ln -s %{firefox_inst_dir} %{buildroot}%{seamonkey_inst_dir}
  
- # install MetaInfo file for firefox
 -
+ # if Fedora >= 21
+ # install MetaInfo file for firefox, etc
+ %if 0%{?fedora} >= 21
  DESTDIR=%{buildroot} appstream-util install %{SOURCE1}
+ %endif
  
  %clean
  rm -rf %{buildroot}
@@@ -81,10 -90,22 +90,23 @@@
  # doc LICENSE.txt
  %{firefox_inst_dir}
  %{seamonkey_inst_dir}
 +%{_datadir}/appdata/*.metainfo.xml
  
+ # GNOME Software Center metadata
+ %if 0%{?fedora} >= 21
+ %{_datadir}/appdata/*.metainfo.xml
+ %endif
+ 
  
  %changelog
+ * Thu Sep 04 2014 Russell Golden <niveusluna at niveusluna.org> - 4.0.0-1
+ - Ruleset fixes to wikimedia, stanford-university, joyent, and gaytorrents.
+ - Merge Android Firefox branch, so Android now has the same release cycle
+  -- as the stable HTTPS Everywhere branch for Firefox.
+ - Remove old unused ContentPolicy code.
+ - FEDORA/RHEL SPECIFIC - Place version conditionals for GNOME Software
+  -- Center metadata in spec file.
+ 
  * Tue Aug 19 2014 Richard Hughes <richard at hughsie.com> - 3.5.3-2
  - Add a MetaInfo file for GNOME Software and Apper.