From 54ea0c5f31e1e08c08c9d828ad95882ce515b6b9 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 3 Mar 2020 15:44:43 -0500 Subject: ublock: fix filenames used for rpm --- .../palemoon-stackrpms-ublock-origin.spec | 2 +- palemoon-ublock-origin/palemoon-ublock-origin.spec | 2 +- waterfox-ublock-origin/waterfox-ublock-origin.spec | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec b/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec index 928596e..1cb9e32 100644 --- a/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec +++ b/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec @@ -11,7 +11,7 @@ Summary: uBlock Origin installed to the system Pale Moon extensions direc 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 diff --git a/palemoon-ublock-origin/palemoon-ublock-origin.spec b/palemoon-ublock-origin/palemoon-ublock-origin.spec index 7ef4844..ae6fb64 100644 --- a/palemoon-ublock-origin/palemoon-ublock-origin.spec +++ b/palemoon-ublock-origin/palemoon-ublock-origin.spec @@ -11,7 +11,7 @@ Summary: uBlock Origin installed to the system Pale Moon extensions direc 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 diff --git a/waterfox-ublock-origin/waterfox-ublock-origin.spec b/waterfox-ublock-origin/waterfox-ublock-origin.spec index 712dcd0..6005740 100644 --- a/waterfox-ublock-origin/waterfox-ublock-origin.spec +++ b/waterfox-ublock-origin/waterfox-ublock-origin.spec @@ -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/^.*//;' -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 -- cgit