[mozilla-adblockplus] make it more universal...

Russell William Golden niveusluna at fedoraproject.org
Wed Dec 10 19:32:16 UTC 2014


commit 868ecfcf1a5bec414ef23383edeeda0a49689a1f
Author: Russell Golden <niveusluna at niveusluna.org>
Date:   Wed Dec 10 13:32:27 2014 -0600

    make it more universal...

 mozilla-adblockplus.spec |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/mozilla-adblockplus.spec b/mozilla-adblockplus.spec
index bd27856..4cd1fe3 100644
--- a/mozilla-adblockplus.spec
+++ b/mozilla-adblockplus.spec
@@ -99,7 +99,7 @@ ln -s %{inst_dir} %{buildroot}%{thunderbird_inst_dir}
 # if Fedora >= 21
 # install MetaInfo file for firefox
 %if 0%{?fedora} >= 21
-DESTDIR=%{buildroot} appstream-util install %{SOURCE1}
+	DESTDIR=%{buildroot} appstream-util install %{SOURCE1}
 %endif
 
 %clean
@@ -111,18 +111,25 @@ rm -rf %{buildroot}
 %{inst_dir}
 %{seamonkey_inst_dir}
 %{thunderbird_inst_dir}
-%{_datadir}/appdata/*.metainfo.xml
+
+# GNOME Software Center metadata
+%if 0%{?fedora} >= 21
+	%{_datadir}/appdata/*.metainfo.xml
+%endif
 
 %changelog
 * Wed Dec 10 2014 Russell Golden <niveusluna at niveusluna.org> - 2.6.6-1
+- spec file is again universal. Mr. Hughes apparently didn't notice that it was to begin with.
 -2.6.5:
 --Fixed: Element hiding exceptions are broken by changes in Firefox 34 and Firefox 35 (issue 1241, issue 1381).
 --Fixed: Blocking via context menu won’t always suggest blocking the most recent request (issue 362).
---Fixed: Issue reporter will complain about too many filter lists even when these filter lists are “special” like the anti-adblock list (issue 690).
+--Fixed: Issue reporter will complain about too many filter lists even when these filter lists are “special”
+---like the anti-adblock list (issue 690).
 --Fixed: Disabling filters via space bar no longer works in preferences (issue 1129).
 --Fixed: Sharing Adblock Plus from the first-run page won’t work if the Anti-Social list is enabled (issue 1133).
 --Fixed: Anti-Adblock warning will sometimes appear on websites without any anti-adblock behavior (issue 1161).
---Made $sitekey option behavior more consistent, it can be used similarly to $domain now rather than whitelisting complete websites only (issue 432).
+--Made $sitekey option behavior more consistent, it can be used similarly to $domain now rather than whitelisting
+---complete websites only (issue 432).
 -
 -2.6.6:
 --Now works on Firefox nightly builds


More information about the scm-commits mailing list