From 7a08ab9f0f5a1aaea9b70bf5079b7ddd312120d2 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 20 Oct 2020 16:11:02 -0400 Subject: use source1 in ublock-origin-combined just like waterfox, the SOURCE0 gets mangled in the copr --- ublock-origin-combined/ublock-origin-combined.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ublock-origin-combined') diff --git a/ublock-origin-combined/ublock-origin-combined.spec b/ublock-origin-combined/ublock-origin-combined.spec index 116acb3..5b8eca6 100644 --- a/ublock-origin-combined/ublock-origin-combined.spec +++ b/ublock-origin-combined/ublock-origin-combined.spec @@ -14,7 +14,8 @@ Summary: uBlock Origin installed to the system Mozilla-based extensions d 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_%{version}.firefox-legacy.xpi +Source0: README.md +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 @@ -43,14 +44,14 @@ EasyPrivacy, and Peter Lowe's ad/tracking/malware servers. %install # learn extension id to name the file -%{__unzip} -o %{SOURCE0} install.rdf +%{__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} )" rm -rf install.rdf # palemoon mkdir -p %{buildroot}%{extdir1} %{buildroot}%{extdir2} %{buildroot}%{extdir3} -install -Dp -m0644 %{SOURCE0} %{buildroot}%{extdir1}/${newfilename} +install -Dp -m0644 %{SOURCE1} %{buildroot}%{extdir1}/${newfilename} ln -s %{extdir1}/${newfilename} %{buildroot}%{extdir2} # waterfox -- cgit