summaryrefslogtreecommitdiff
path: root/ublock-origin-combined/ublock-origin-combined.spec
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2021-03-18 19:21:53 +0000
committerB. Stack <bgstack15@gmail.com>2021-03-18 19:21:53 +0000
commite6364a4c6d1597f0ea3a8a806c7610106277b2c4 (patch)
treec78cc4cb3e941c96b0f7cb875085051f053176ac /ublock-origin-combined/ublock-origin-combined.spec
parentadd freefilesync alternative (diff)
parentAdd newmoon rpm (diff)
downloadstackrpms-e6364a4c6d1597f0ea3a8a806c7610106277b2c4.tar.gz
stackrpms-e6364a4c6d1597f0ea3a8a806c7610106277b2c4.tar.bz2
stackrpms-e6364a4c6d1597f0ea3a8a806c7610106277b2c4.zip
Merge branch 'palemoon-bump' into 'master'
Palemoon bump See merge request bgstack15/stackrpms!226
Diffstat (limited to 'ublock-origin-combined/ublock-origin-combined.spec')
-rw-r--r--ublock-origin-combined/ublock-origin-combined.spec17
1 files changed, 11 insertions, 6 deletions
diff --git a/ublock-origin-combined/ublock-origin-combined.spec b/ublock-origin-combined/ublock-origin-combined.spec
index 7360f92..1e82cde 100644
--- a/ublock-origin-combined/ublock-origin-combined.spec
+++ b/ublock-origin-combined/ublock-origin-combined.spec
@@ -1,14 +1,13 @@
-# palemoon
%global extdir1 %{_libdir}/palemoon/browser/extensions
%global extdir2 %{_libdir}/palemoon-stackrpms/browser/extensions
-# waterfox
%global extdir3 %{_datadir}/waterfox/extensions/%{app_id}
+%global extdir4 %{_libdir}/newmoon/browser/extensions
%global app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
Name: ublock-origin-combined
Version: 1.16.4.28
-Release: 1
+Release: 2
Summary: uBlock Origin installed to the system Mozilla-based extensions directories
Group: Applications/Internet
@@ -21,7 +20,7 @@ BuildRequires: coreutils
BuildArch: noarch
Obsoletes: palemoon-ublock-origin <= 1.16.4.25-1, palemoon-stackrpms-ublock-origin <= 1.16.4.25-1, waterfox-ublock-origin <= 1.16.4.25-1
-Conflicts: palemoon-ublock-origin, palemoon-stackrpms-ublock-origin, waterfox-ublock-origin
+Conflicts: palemoon-ublock-origin, palemoon-stackrpms-ublock-origin, waterfox-ublock-origin, newmoon-ublock-origin
%if 0%{?fedora} || ( 0%{?rhel} >= 8 )
Suggests: mozilla-filesystem
@@ -49,11 +48,14 @@ newfilename="$( grep 'em:id' install.rdf 2>/dev/null | head -n1 | sed -r -e 's/^
test -z "${newfilename}" && newfilename="$( basename %{SOURCE1} )"
rm -rf install.rdf
+mkdir -p %{buildroot}%{extdir1} %{buildroot}%{extdir2} %{buildroot}%{extdir3} %{buildroot}%{extdir4}
+
# palemoon
-mkdir -p %{buildroot}%{extdir1} %{buildroot}%{extdir2} %{buildroot}%{extdir3}
install -Dp -m0644 %{SOURCE1} %{buildroot}%{extdir1}/${newfilename}
+# firefox
ln -s %{extdir1}/${newfilename} %{buildroot}%{extdir2}
-
+# newmoon
+ln -s %{extdir1}/${newfilename} %{buildroot}%{extdir4}
# waterfox
ln -sf %{extdir1}/${newfilename} %{buildroot}%{extdir3}
@@ -68,6 +70,9 @@ rm -rf %{buildroot}
# something gets weird because of the curly braces in the expanded variable, but using the ../* syntax changes the evaluated string so it does not have to try to use curly braces in the owned filepath.
%changelog
+* Thu Mar 18 2021 B. Stack <bgstack15@gmail.com> - 1.16.4.28-2
+- Add newmoon
+
* Mon Feb 01 2021 B. Stack <bgstack15@gmail.com> - 1.16.4.28-1
- Update
bgstack15