diff options
| author | B Stack <bgstack15@gmail.com> | 2020-10-20 15:18:50 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-10-20 15:18:50 -0400 |
| commit | 61bd1dbcb3fd03d0ffd2a4dea8dbf5065b0bb2e1 (patch) | |
| tree | 093b8eba9a81d8b2349a84383a2e97f8072b6f41 /ublock-origin-combined | |
| parent | ublock-origin-combined rc1 (diff) | |
| download | stackrpms-61bd1dbcb3fd03d0ffd2a4dea8dbf5065b0bb2e1.tar.gz stackrpms-61bd1dbcb3fd03d0ffd2a4dea8dbf5065b0bb2e1.tar.bz2 stackrpms-61bd1dbcb3fd03d0ffd2a4dea8dbf5065b0bb2e1.zip | |
fix rpm for ubo-combined
Diffstat (limited to 'ublock-origin-combined')
| -rw-r--r-- | ublock-origin-combined/ublock-origin-combined.spec | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ublock-origin-combined/ublock-origin-combined.spec b/ublock-origin-combined/ublock-origin-combined.spec index 7b67dc1..116acb3 100644 --- a/ublock-origin-combined/ublock-origin-combined.spec +++ b/ublock-origin-combined/ublock-origin-combined.spec @@ -2,7 +2,7 @@ %global extdir1 %{_libdir}/palemoon/browser/extensions %global extdir2 %{_libdir}/palemoon-stackrpms/browser/extensions # waterfox -%global extdir3 %{_datadir}/%{app_name}/extensions/%{app_id} +%global extdir3 %{_datadir}/waterfox/extensions/%{app_id} %global app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} @@ -19,7 +19,7 @@ BuildRequires: unzip BuildRequires: coreutils BuildArch: noarch -Obsoletes: palemoon-ublock-origin, palemoon-stackrpms-ublock-origin, waterfox-ublock-origin +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 %if 0%{?fedora} || ( 0%{?rhel} >= 8 ) @@ -46,6 +46,7 @@ EasyPrivacy, and Peter Lowe's ad/tracking/malware servers. %{__unzip} -o %{SOURCE0} 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} )" +rm -rf install.rdf # palemoon mkdir -p %{buildroot}%{extdir1} %{buildroot}%{extdir2} %{buildroot}%{extdir3} @@ -53,9 +54,7 @@ install -Dp -m0644 %{SOURCE0} %{buildroot}%{extdir1}/${newfilename} ln -s %{extdir1}/${newfilename} %{buildroot}%{extdir2} # waterfox -ln -s %{extdir1}/${newfilename} %{buildroot}%{extdir3} - -rm -rf install.rdf +ln -sf %{extdir1}/${newfilename} %{buildroot}%{extdir3} %clean rm -rf %{buildroot} @@ -64,7 +63,8 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{extdir1}/*.xpi %{extdir2}/*.xpi -%{extdir3}/*.xpi +%{extdir3}/../*/*.xpi +# 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 * Tue Oct 20 2020 B Stack <bgstack15@gmail.com> - 1.16.4.25-1 |