summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-01-28 08:17:00 -0500
committerB Stack <bgstack15@gmail.com>2020-01-28 08:17:00 -0500
commit0135a1308fa0c9d8241d3f9f9f6ea0d7810e160a (patch)
tree8a1889b1219f9679bca7bc9737823cd163083b25
parentnotepadpp 7.8.3 (diff)
downloadstackrpms-0135a1308fa0c9d8241d3f9f9f6ea0d7810e160a.tar.gz
stackrpms-0135a1308fa0c9d8241d3f9f9f6ea0d7810e160a.tar.bz2
stackrpms-0135a1308fa0c9d8241d3f9f9f6ea0d7810e160a.zip
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.
-rw-r--r--waterfox-ublock-origin/waterfox-ublock-origin.spec3
1 files changed, 2 insertions, 1 deletions
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/^.*<em:id>//;' -e 's/<\/em:id>.*$//;' ).xpi"
test -z "${newfilename}" && newfilename="$( basename %{SOURCE0} )"
bgstack15