Merge branch 'ublock-bump' into 'master'

ublock 1.16.4.19

See merge request bgstack15/stackrpms!132

5 files changed, 29 insertions, 8 deletions

diff --git a/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec b/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec
index b61f608..1cb9e32 100644
--- a/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec
+++ b/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec
@@ -4,14 +4,14 @@
 #%%global app_id
 
 Name:           %{app_name}-ublock-origin
-Version:        1.16.4.18
+Version:        1.16.4.19
 Release:        1
 Summary:        uBlock Origin installed to the system Pale Moon extensions directory
 
 Group:          Applications/Internet
 License:        GPLv3
 URL:            https://github.com/gorhill/uBlock
-Source0:        https://github.com/gorhill/uBlock-for-firefox-legacy/releases/download/firefox-legacy-%{version}/uBlock0.firefox-legacy.xpi
+Source0:        https://github.com/gorhill/uBlock-for-firefox-legacy/releases/download/firefox-legacy-%{version}/uBlock0_%{version}.firefox-legacy.xpi
 BuildRequires:  unzip
 BuildRequires:  coreutils
 BuildArch:      noarch
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{moz_extensions}/*.xpi
 
 %changelog
+* Tue Mar 03 2020 B Stack <bgstack15@gmail.com> - 1.16.4.19-1
+- Update
+
 * Tue Feb 18 2020 B Stack <bgstack15@gmail.com> - 1.16.4.18-1
 - Update
 
diff --git a/palemoon-ublock-origin/debian/changelog b/palemoon-ublock-origin/debian/changelog
index 083b21c..a593224 100644
--- a/palemoon-ublock-origin/debian/changelog
+++ b/palemoon-ublock-origin/debian/changelog
@@ -1,3 +1,9 @@
+palemoon-ublock-origin (1.16.4.19-1+devuan) obs; urgency=medium
+
+  * Update
+
+ -- B Stack <bgstack15@gmail.com>  Tue, 03 Mar 2020 14:30:03 -0500
+
 palemoon-ublock-origin (1.16.4.18-1+devuan) obs; urgency=medium
 
   * Update
diff --git a/palemoon-ublock-origin/palemoon-ublock-origin.spec b/palemoon-ublock-origin/palemoon-ublock-origin.spec
index 09e01ae..ae6fb64 100644
--- a/palemoon-ublock-origin/palemoon-ublock-origin.spec
+++ b/palemoon-ublock-origin/palemoon-ublock-origin.spec
@@ -4,14 +4,14 @@
 #%%global app_id
 
 Name:           %{app_name}-ublock-origin
-Version:        1.16.4.18
+Version:        1.16.4.19
 Release:        1
 Summary:        uBlock Origin installed to the system Pale Moon extensions directory
 
 Group:          Applications/Internet
 License:        GPLv3
 URL:            https://github.com/gorhill/uBlock
-Source0:        https://github.com/gorhill/uBlock-for-firefox-legacy/releases/download/firefox-legacy-%{version}/uBlock0.firefox-legacy.xpi
+Source0:        https://github.com/gorhill/uBlock-for-firefox-legacy/releases/download/firefox-legacy-%{version}/uBlock0_%{version}.firefox-legacy.xpi
 BuildRequires:  unzip
 BuildRequires:  coreutils
 BuildArch:      noarch
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{moz_extensions}/*.xpi
 
 %changelog
+* Tue Mar 03 2020 B Stack <bgstack15@gmail.com> - 1.16.4.19-1
+- Update
+
 * Tue Feb 18 2020 B Stack <bgstack15@gmail.com> - 1.16.4.18-1
 - Update
 
diff --git a/waterfox-ublock-origin/debian/changelog b/waterfox-ublock-origin/debian/changelog
index d6c8d66..2b4a906 100644
--- a/waterfox-ublock-origin/debian/changelog
+++ b/waterfox-ublock-origin/debian/changelog
@@ -1,3 +1,9 @@
+waterfox-ublock-origin (1.16.4.19-1+devuan) obs; urgency=medium
+
+  * Update
+
+ -- B Stack <bgstack15@gmail.com>  Tue, 03 Mar 2020 14:30:03 -0500
+
 waterfox-ublock-origin (1.16.4.18-1+devuan) obs; urgency=medium
 
   * Update
diff --git a/waterfox-ublock-origin/waterfox-ublock-origin.spec b/waterfox-ublock-origin/waterfox-ublock-origin.spec
index f717808..6005740 100644
--- a/waterfox-ublock-origin/waterfox-ublock-origin.spec
+++ b/waterfox-ublock-origin/waterfox-ublock-origin.spec
@@ -4,7 +4,7 @@
 %global app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 
 Name:           %{app_name}-ublock-origin
-Version:        1.16.4.18
+Version:        1.16.4.19
 Release:        1
 Summary:        uBlock Origin installed to system Waterfox extensions directory
 
@@ -12,7 +12,7 @@ Group:          Applications/Internet
 License:        GPLv3+ and LGPLv3 and MIT and OFL
 URL:            https://github.com/gorhill/uBlock
 Source0:        README.md
-Source1:        https://github.com/gorhill/uBlock-for-firefox-legacy/releases/download/firefox-legacy-%{version}/uBlock0.firefox-legacy.xpi
+Source1:        https://github.com/gorhill/uBlock-for-firefox-legacy/releases/download/firefox-legacy-%{version}/uBlock0_%{version}.firefox-legacy.xpi
 BuildRequires:  unzip
 BuildRequires:  coreutils
 BuildArch:      noarch
@@ -37,10 +37,10 @@ EasyPrivacy, and Peter Lowe's ad/tracking/malware servers.
 # learn extension id to name the file
 %{__unzip} -o %{SOURCE1} install.rdf
 newfilename="$( grep 'em:id' install.rdf 2>/dev/null | head -n1 | sed -r -e 's/^.*<em:id>//;' -e 's/<\/em:id>.*$//;' ).xpi"
-test -z "${newfilename}" && newfilename="$( basename %{SOURCE0} )"
+test -z "${newfilename}" && newfilename="$( basename %{SOURCE1} )"
 
 mkdir -p %{buildroot}%{moz_extensions}/%{app_id}
-install -Dp -m0644 %{SOURCE0} %{buildroot}%{moz_extensions}/%{app_id}/${newfilename}
+install -Dp -m0644 %{SOURCE1} %{buildroot}%{moz_extensions}/%{app_id}/${newfilename}
 
 rm -rf install.rdf
 
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{moz_extensions}/*/*.xpi
 
 %changelog
+* Tue Mar 03 2020 B Stack <bgstack15@gmail.com> - 1.16.4.19-1
+- Update
+
 * Tue Feb 18 2020 B Stack <bgstack15@gmail.com> - 1.16.4.18-1
 - Update