From 99075195c0d0a78de6ca54305f8f4e5125d1fa94 Mon Sep 17 00:00:00 2001 From: B Stack Date: Sat, 15 Sep 2018 20:26:15 -0400 Subject: add waterfox-ublock-origin and fix palemoon-ub --- palemoon-ublock-origin/palemoon-ublock-origin.spec | 33 ++++++------ waterfox-ublock-origin/waterfox-ublock-origin.spec | 61 ++++++++++++++++++++++ 2 files changed, 78 insertions(+), 16 deletions(-) create mode 100644 waterfox-ublock-origin/waterfox-ublock-origin.spec diff --git a/palemoon-ublock-origin/palemoon-ublock-origin.spec b/palemoon-ublock-origin/palemoon-ublock-origin.spec index c621edc..95a04e6 100644 --- a/palemoon-ublock-origin/palemoon-ublock-origin.spec +++ b/palemoon-ublock-origin/palemoon-ublock-origin.spec @@ -1,9 +1,11 @@ -#palemoon globals +# palemoon globals %global moz_extensions %{_libdir}/palemoon/browser/extensions +%global app_name palemoon +#%%global app_id -Name: palemoon-ublock-origin +Name: %{app_name}-ublock-origin Version: 1.16.4.4 -Release: 1 +Release: 2 Summary: uBlock Origin installed to the system Pale Moon extensions directory Group: Applications/Internet @@ -12,33 +14,32 @@ URL: https://github.com/gorhill/uBlock Source0: https://github.com/gorhill/uBlock/releases/download/firefox-legacy-%{version}/uBlock0.firefox-legacy.xpi BuildRequires: unzip BuildRequires: coreutils -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +#Requires: mozilla-filesystem +#Requires: %%{app_name}-filesystem + %description -uBlock Origin is NOT an "ad blocker": it is a wide-spectrum blocker -- -which happens to be able to function as a mere "ad blocker". The -default behavior of uBlock Origin when newly installed is to block ads, -trackers and malware sites -- through EasyList, EasyPrivacy, Peter Lowe's -ad/tracking/malware servers, various lists of malware sites, and uBlock -Origin's own filter lists. +The "legacy" release of uBlock Origin (NPAPI) for tradional Mozilla-style +web browsers. This is packaged for %{app_name}. + +More than just an ad blocker, uBlock Origin provides the ability to block +at will and easy defaults based on various common lists, such as EasyList, +EasyPrivacy, and Peter Lowe's ad/tracking/malware servers. %prep #%setup -q -c %build -rm -rf %{buildroot} %install -rm -rf %{buildroot} - # learn extension id to name the file %{__unzip} -o %{SOURCE0} 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} )" mkdir -p %{buildroot}%{moz_extensions} -install -Dp -m 644 %{SOURCE0} %{buildroot}%{moz_extensions}/${newfilename} +install -Dp -m0644 %{SOURCE0} %{buildroot}%{moz_extensions}/${newfilename} rm -rf install.rdf @@ -50,8 +51,8 @@ rm -rf %{buildroot} %{moz_extensions}/*.xpi %changelog -* Thu Sep 13 2018 B Stack 1.16.4.4-1 -- Update version and customize to palemoon +* Sat Sep 15 2018 B Stack 1.16.4.4-2 +- Customize for stackrpms * Wed Aug 2 2017 Ian Firns - 1.13.8-1 - Update to 1.13.8 release diff --git a/waterfox-ublock-origin/waterfox-ublock-origin.spec b/waterfox-ublock-origin/waterfox-ublock-origin.spec new file mode 100644 index 0000000..906e963 --- /dev/null +++ b/waterfox-ublock-origin/waterfox-ublock-origin.spec @@ -0,0 +1,61 @@ +# waterfox globals +%global moz_extensions %{_datadir}/%{app_name}/extensions +%global app_name waterfox +%global app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} + +Name: %{app_name}-ublock-origin +Version: 1.16.4.4 +Release: 2 +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 +BuildRequires: unzip +BuildRequires: coreutils +BuildArch: noarch + +Requires: mozilla-filesystem +Requires: %{app_name}-filesystem + +%description +The "legacy" release of uBlock Origin (NPAPI) for tradional Mozilla-style +web browsers. This is packaged for %{app_name}. + +More than just an ad blocker, uBlock Origin provides the ability to block +at will and easy defaults based on various common lists, such as EasyList, +EasyPrivacy, and Peter Lowe's ad/tracking/malware servers. + +%prep +#%setup -q -c + +%build + +%install +# learn extension id to name the file +%{__unzip} -o %{SOURCE0} 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} )" + +mkdir -p %{buildroot}%{moz_extensions}/%{app_id} +install -Dp -m0644 %{SOURCE0} %{buildroot}%{moz_extensions}/%{app_id}/${newfilename} + +rm -rf install.rdf + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%{moz_extensions}/*/*.xpi + +%changelog +* Sat Sep 15 2018 B Stack - 1.16.4.4-2 +- Customize for stackrpms + +* Fri Jul 20 2018 Phantom X - 1.16.4.4-1 +- 1.16.4.4 + +* Wed Jun 13 2018 Phantom X - 1.16.4.1-1 +- Initial spec -- cgit