From 9f70da39af032a34f0cb6e06fd130a4ae5256829 Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 27 Jan 2020 08:46:55 -0500 Subject: ublock origin update --- waterfox-ublock-origin/waterfox-ublock-origin.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'waterfox-ublock-origin/waterfox-ublock-origin.spec') diff --git a/waterfox-ublock-origin/waterfox-ublock-origin.spec b/waterfox-ublock-origin/waterfox-ublock-origin.spec index 332a11c..bc2afa0 100644 --- a/waterfox-ublock-origin/waterfox-ublock-origin.spec +++ b/waterfox-ublock-origin/waterfox-ublock-origin.spec @@ -4,14 +4,14 @@ %global app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} Name: %{app_name}-ublock-origin -Version: 1.16.4.14 +Version: 1.16.4.16 Release: 1 Summary: uBlock Origin installed to system Waterfox extensions directory Group: Applications/Internet License: GPLv3+ and LGPLv3 and MIT and OFL URL: https://github.com/gorhill/uBlock -Source0: https://github.com/gorhill/uBlock/releases/download/firefox-legacy-%{version}/uBlock0.firefox-legacy.xpi +Source0: https://github.com/gorhill/uBlock-for-firefox-legacy/releases/download/firefox-legacy-%{version}/uBlock0.firefox-legacy.xpi BuildRequires: unzip BuildRequires: coreutils BuildArch: noarch @@ -51,6 +51,10 @@ rm -rf %{buildroot} %{moz_extensions}/*/*.xpi %changelog +* Mon Jan 27 2020 B Stack - 1.16.4.16-1 +- Update +- Upstream changed locations + * Tue Jan 14 2020 B Stack - 1.16.4.14-1 - Update -- cgit From 0135a1308fa0c9d8241d3f9f9f6ea0d7810e160a Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 28 Jan 2020 08:17:00 -0500 Subject: WIP: waterfox-ublock-origin, fix srpm build problem https://lists.fedorahosted.org/archives/list/copr-devel@lists.fedorahosted.org/thread/QNXS45XTMJ2EJTDKM7LCYDIUSUR4RPJD/ Deprecation of auto-packing for rpkg - copr-devel - Fedora Mailing search 'rpm "auto-packing"' The source0 source is sometimes built as a plain tar file of the entire scm directory, i.e., not what we want! So we are trying to use source1, which hopefully will be the xpi file we intend to download for this package. --- waterfox-ublock-origin/waterfox-ublock-origin.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'waterfox-ublock-origin/waterfox-ublock-origin.spec') diff --git a/waterfox-ublock-origin/waterfox-ublock-origin.spec b/waterfox-ublock-origin/waterfox-ublock-origin.spec index bc2afa0..bae3097 100644 --- a/waterfox-ublock-origin/waterfox-ublock-origin.spec +++ b/waterfox-ublock-origin/waterfox-ublock-origin.spec @@ -12,6 +12,7 @@ Group: Applications/Internet License: GPLv3+ and LGPLv3 and MIT and OFL URL: https://github.com/gorhill/uBlock Source0: 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.firefox-legacy.xpi BuildRequires: unzip BuildRequires: coreutils BuildArch: noarch @@ -34,7 +35,7 @@ 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} )" -- cgit From 884ae42190a390a342024e01a2b9f9928d7fb9f1 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 28 Jan 2020 13:47:01 +0000 Subject: change source0 to solve rpkg issue in copr --- waterfox-ublock-origin/waterfox-ublock-origin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'waterfox-ublock-origin/waterfox-ublock-origin.spec') diff --git a/waterfox-ublock-origin/waterfox-ublock-origin.spec b/waterfox-ublock-origin/waterfox-ublock-origin.spec index bae3097..042f490 100644 --- a/waterfox-ublock-origin/waterfox-ublock-origin.spec +++ b/waterfox-ublock-origin/waterfox-ublock-origin.spec @@ -11,7 +11,7 @@ Summary: uBlock Origin installed to system Waterfox extensions directory Group: Applications/Internet License: GPLv3+ and LGPLv3 and MIT and OFL 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: README.md Source1: https://github.com/gorhill/uBlock-for-firefox-legacy/releases/download/firefox-legacy-%{version}/uBlock0.firefox-legacy.xpi BuildRequires: unzip BuildRequires: coreutils -- cgit