From d39fe8f92a25e0da2a507b77cbf3494a4b7789a1 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Sep 11 2019 10:02:53 +0000
Subject: Merge branch 'f29' into f30


---

diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec
index 05bf7d9..290eb79 100644
--- a/mozilla-ublock-origin.spec
+++ b/mozilla-ublock-origin.spec
@@ -5,11 +5,11 @@
 %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id}
 
-%global fileid 3392439
+%global fileid 3398284
 
 Name:           mozilla-ublock-origin
 Version:        1.22.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An efficient blocker for Firefox
 
 License:        GPLv3+ and LGPLv3 and MIT and OFL
@@ -57,6 +57,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain
 %{_metainfodir}/%{name}.metainfo.xml
 
 %changelog
+* Wed Sep 11 2019 Dominik Mierzejewski <rpm@greysector.net> - 1.22.2-2
+- fix wrong fileid (was pointing to 1.20.0 instead of 1.22.2)
+
 * Mon Sep 09 2019 Dominik Mierzejewski <rpm@greysector.net> - 1.22.2-1
 - update to 1.22.2 (#1713383)
 
diff --git a/sources b/sources
index c61b4ca..aba1c58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ublock_origin-1.22.2-an+fx.xpi) = 6c558e8fe6e549a5e5b2e9ad1f6c77d96618b223436004f01f98238015aea6be1d4ad76130aad28768bf96b3193a681d193c1fc4b3cd1c52ec71b1e710f70da8
+SHA512 (ublock_origin-1.22.2-an+fx.xpi) = 63c645325fe5e4c01b0a48f5da86bbfe4cbaf2872f29a20b8d77b48d033811e2f035d2c480532f635bd2090c52a983d83fad2d96be599f5e65f32c8b5aabc99c