From 7fba3dd4891a8c2fcd5ff2089aa4a8c4ef7a7244 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 23:47:28 +0000 Subject: [PATCH 01/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index ef6c9e4..d23e396 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -9,7 +9,7 @@ Name: mozilla-ublock-origin Version: 1.43.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3 and MIT and OFL and Unlicense @@ -104,6 +104,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.43.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Dominik Mierzejewski - 1.43.0-1 - update to 1.43.0 (#2095350) From 8541989f5461aa1626b4439e546ca06118f78718 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 20:46:47 +0000 Subject: [PATCH 02/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 30a1949..cd0f4a8 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -9,7 +9,7 @@ Name: mozilla-ublock-origin Version: 1.46.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3 and MIT and OFL and Unlicense @@ -106,6 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.46.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Dec 27 2022 Dominik Mierzejewski - 1.46.0-1 - update to 1.46.0 (#2156059) From 60f7229a0e7d76d9c5c4edeacf34013ca670671a Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 12 Jun 2023 23:22:06 +0200 Subject: [PATCH 03/31] update to 1.50.0 (#2213457) - match upstream build process for uAssets to avoid missing timestamps --- mozilla-ublock-origin.spec | 20 ++++++++++++-------- sources | 4 ++-- uAssets-mktarball.sh | 18 +++++++++++------- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 9033af1..60a1831 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -5,10 +5,8 @@ %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} -%global uAssets_commit 4d18934be5d06f3aaaaeeed786e9e7e99b2a0e17 - Name: mozilla-ublock-origin -Version: 1.49.2 +Version: 1.50.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -16,7 +14,7 @@ License: GPLv3 and MIT and OFL and Unlicense URL: https://github.com/gorhill/uBlock Source0: https://github.com/gorhill/uBlock/archive/%{version}/uBlock-%{version}.tar.gz Source1: mozilla-ublock-origin.metainfo.xml -Source2: uAssets-%{uAssets_commit}.tar.gz +Source2: uAssets-%{version}.tar.gz # uAssets tarball contains non-free filter lists # thirdparties/mirror1.malwaredomains.com - http://www.malwaredomains.com/?page_id=1508 # thirdparties/pgl.yoyo.org - https://pgl.yoyo.org/license/ @@ -30,6 +28,7 @@ BuildArch: noarch ExcludeArch: ppc64 s390x BuildRequires: binaryen BuildRequires: libappstream-glib +BuildRequires: nodejs BuildRequires: python3 BuildRequires: wabt # lib/csstree https://github.com/csstree/csstree MIT @@ -67,10 +66,11 @@ from hosts files. %prep # https://github.com/gorhill/uBlock/tree/master/dist#build-instructions-for-developers %setup -q -n uBlock-%{version} -mkdir -p dist/build/uAssets/{main,prod} -tar -xz -C dist/build/uAssets/main --strip-components=1 -f %{SOURCE2} -ln -s ../main/thirdparties/easylist-downloads.adblockplus.org dist/build/uAssets/prod/thirdparties -ln -s ../main/filters dist/build/uAssets/prod/filters +mkdir -p dist/build/uAssets +tar -xz -C dist/build/uAssets -f %{SOURCE2} +pushd dist/build/uAssets/main +tools/make-ublock.sh +popd %patch0 -p1 rm src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}}/*.wasm mv src/css/fonts/Inter/LICENSE.txt LICENSE.Inter.txt @@ -106,6 +106,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Mon Jun 12 2023 Dominik Mierzejewski - 1.50.0-1 +- update to 1.50.0 (#2213457) +- match upstream build process for uAssets to avoid missing timestamps + * Sat May 06 2023 Dominik Mierzejewski - 1.49.2-1 - update to 1.49.2 (#2180855) diff --git a/sources b/sources index 2219689..f7218c7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-4d18934be5d06f3aaaaeeed786e9e7e99b2a0e17.tar.gz) = ce01e8b48c2dd8a6079b7560e6dcef81d79523c8a0b63fbb11f87608bb0163ebc0901d759e74ea8a2f98d9d5f5237bcf405d1e4088e519ad31aaa65ff6455942 -SHA512 (uBlock-1.49.2.tar.gz) = 2b4f3627f221a3f45516a0d5258daa6b57b88a78cf15a2a77a997b92c3eb6da28707aeae5a14ee20852481e59b33deb7c73da7d84b2fc5e3f6077729f5f4ac79 +SHA512 (uAssets-1.50.0.tar.gz) = 39a478bdd16924f044c274a8cf8b5e761e77a0521387325a1df210daf9c98e53a99db479d3812f61f92712b5a21fcad5a006ad7e12ceab38eb0e546ca6cabccd +SHA512 (uBlock-1.50.0.tar.gz) = bde1c632309861205e5108e6d79e7dfa3f23a8634f25f2c7f622db1336f442af52586378446d873347d54d2f445b85dd96e28e2d06aae9b41688be08e771acde diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 5f51d6e..10bcfa4 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -13,14 +13,18 @@ cleanup() { unset CDPATH pwd=$(pwd) name=uAssets -commit=4d18934be5d06f3aaaaeeed786e9e7e99b2a0e17 -url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${commit}.tar.gz +version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) +commit_master=071cef3879b968973728085576f8fbbe25619567 +commit_gh_pages=5788c6b92447d8211fcd9a3da91e5499c641fb4f +url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz +url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" -curl -L ${url} | tar xzf - -pushd ${name}-${commit} +curl -L ${url_master} | tar xzf - +mv ${name}-${commit_master} main # Peter Lowe's adservers list is non-commercial-only # https://github.com/uBlockOrigin/uAssets/issues/7657 -rm -r thirdparties/pgl.yoyo.org -popd -tar czf "$pwd"/${name}-${commit}.tar.gz ${name}-${commit} +rm -r main/thirdparties/pgl.yoyo.org +curl -L ${url_gh_pages} | tar xzf - +mv ${name}-${commit_gh_pages} prod +tar czf "$pwd"/${name}-${version}.tar.gz main prod popd From 394fd479120cda2f0afb84558b0c43e160a3f01a Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 13 Jun 2023 09:53:28 +0200 Subject: [PATCH 04/31] fix deprecated patchN macro usage --- mozilla-ublock-origin.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 60a1831..8cbc85e 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -71,7 +71,7 @@ tar -xz -C dist/build/uAssets -f %{SOURCE2} pushd dist/build/uAssets/main tools/make-ublock.sh popd -%patch0 -p1 +%patch 0 -p1 rm src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}}/*.wasm mv src/css/fonts/Inter/LICENSE.txt LICENSE.Inter.txt mv src/img/fontawesome/LICENSE.txt LICENSE.fontawesome.txt @@ -109,6 +109,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain * Mon Jun 12 2023 Dominik Mierzejewski - 1.50.0-1 - update to 1.50.0 (#2213457) - match upstream build process for uAssets to avoid missing timestamps +- fix deprecated patchN macro usage * Sat May 06 2023 Dominik Mierzejewski - 1.49.2-1 - update to 1.49.2 (#2180855) From f02278d499ace79709b34e58dddd35fb20a47e60 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 15:51:02 +0000 Subject: [PATCH 05/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index e73209a..cf4e49a 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -7,7 +7,7 @@ Name: mozilla-ublock-origin Version: 1.50.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3 and MIT and OFL and Unlicense @@ -106,6 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.50.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jun 12 2023 Dominik Mierzejewski - 1.50.0-1 - update to 1.50.0 (#2213457) - match upstream build process for uAssets to avoid missing timestamps From 77e946728711cb871010d9117788bedeb83e3857 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Thu, 31 Aug 2023 22:48:44 +0200 Subject: [PATCH 06/31] update to 1.51.0 (#2224682) --- mozilla-ublock-origin.spec | 5 ++++- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 8cbc85e..01845e3 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.50.0 +Version: 1.51.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -106,6 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Thu Aug 31 2023 Dominik Mierzejewski - 1.51.0-1 +- update to 1.51.0 (#2224682) + * Mon Jun 12 2023 Dominik Mierzejewski - 1.50.0-1 - update to 1.50.0 (#2213457) - match upstream build process for uAssets to avoid missing timestamps diff --git a/sources b/sources index f7218c7..c8a1db9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.50.0.tar.gz) = 39a478bdd16924f044c274a8cf8b5e761e77a0521387325a1df210daf9c98e53a99db479d3812f61f92712b5a21fcad5a006ad7e12ceab38eb0e546ca6cabccd -SHA512 (uBlock-1.50.0.tar.gz) = bde1c632309861205e5108e6d79e7dfa3f23a8634f25f2c7f622db1336f442af52586378446d873347d54d2f445b85dd96e28e2d06aae9b41688be08e771acde +SHA512 (uAssets-1.51.0.tar.gz) = a42121c19ad086b7c51b4d23aae7c0d3a077200a450bbce76ef510f829f79a13db1c3a885f0338637837141f68795e0d21cf387717c0e8f2aa59039c8daeff5a +SHA512 (uBlock-1.51.0.tar.gz) = a593fb19263d35423e69bb151cf56c6eb6f10fe16e3f1539820783cc06845c5604f9beb35ae828cdb20fad34127f59b8aec4c77a58edafd25b61d6c5a7b2d6ea diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 10bcfa4..6d80c39 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=071cef3879b968973728085576f8fbbe25619567 -commit_gh_pages=5788c6b92447d8211fcd9a3da91e5499c641fb4f +commit_master=8abf7f8515a27ab8cabb1c1c4a3aeddc84078a25 +commit_gh_pages=e6cfb0f03b682b9927c5e25393c3cf6cc4d3b7e0 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 07e5a216eb1209ca11b9ed98e598287f3dcaff27 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Thu, 31 Aug 2023 22:57:40 +0200 Subject: [PATCH 07/31] new bundled dependency: js-beautify --- mozilla-ublock-origin.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 01845e3..021ba50 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -39,6 +39,8 @@ Provides: bundled(fontawesome-fonts) = 4.7.0 Provides: bundled(inter-fonts) # css/fonts/Metropolis/Metropolis-*.woff2 https://github.com/chrismsimpson/Metropolis Unlicense Provides: bundled(metropolis-fonts) +# lib/js-beautify https://github.com/beautify-web/js-beautify MIT +Provides: bundled(js-beautify) = 1.14.7 # lib/punycode.js https://mths.be/punycode MIT Provides: bundled(js-punycode) = 1.3.2 # lib/diff https://github.com/Swatinem/diff LGPLv3 @@ -75,6 +77,7 @@ popd rm src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}}/*.wasm mv src/css/fonts/Inter/LICENSE.txt LICENSE.Inter.txt mv src/img/fontawesome/LICENSE.txt LICENSE.fontawesome.txt +mv src/lib/js-beautify/LICENSE LICENSE.js-beautify.txt mv src/lib/codemirror/LICENSE LICENSE.codemirror.txt %build @@ -100,6 +103,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %license LICENSE.txt %license LICENSE.codemirror.txt %license LICENSE.fontawesome.txt +%license LICENSE.js-beautify.txt %license LICENSE.Inter.txt %license src/css/fonts/Metropolis/UNLICENSE %{firefox_inst_dir}/%{ext_id}.xpi @@ -108,6 +112,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %changelog * Thu Aug 31 2023 Dominik Mierzejewski - 1.51.0-1 - update to 1.51.0 (#2224682) +- new bundled dependency: js-beautify * Mon Jun 12 2023 Dominik Mierzejewski - 1.50.0-1 - update to 1.50.0 (#2213457) From 61e4f45c582789633507132f632a674f271d1475 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 29 Sep 2023 11:48:56 +0200 Subject: [PATCH 08/31] update to 1.52.2 (#2238126) --- mozilla-ublock-origin.spec | 5 ++++- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 021ba50..5add87d 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.51.0 +Version: 1.52.2 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Fri Sep 29 2023 Dominik Mierzejewski - 1.52.2-1 +- update to 1.52.2 (#2238126) + * Thu Aug 31 2023 Dominik Mierzejewski - 1.51.0-1 - update to 1.51.0 (#2224682) - new bundled dependency: js-beautify diff --git a/sources b/sources index c8a1db9..7aae05d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.51.0.tar.gz) = a42121c19ad086b7c51b4d23aae7c0d3a077200a450bbce76ef510f829f79a13db1c3a885f0338637837141f68795e0d21cf387717c0e8f2aa59039c8daeff5a -SHA512 (uBlock-1.51.0.tar.gz) = a593fb19263d35423e69bb151cf56c6eb6f10fe16e3f1539820783cc06845c5604f9beb35ae828cdb20fad34127f59b8aec4c77a58edafd25b61d6c5a7b2d6ea +SHA512 (uAssets-1.52.2.tar.gz) = 616d187e99b4744854cdd97c0e41193b92c9c612f308e980afee4dda23d3ca7fe4fbf9d61e0e25fcb625bec1eb4c1da2277c291364b52c1126715cd4b61531fb +SHA512 (uBlock-1.52.2.tar.gz) = 02deb47dcf14ff6688d095982030ff301be95af1942b690e01862bc8a8ce4c6e868730f5f850971ca08d6a2977a2e9c14ec062b7ce093009defd5b1c1562ed9d diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 6d80c39..c51fd76 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=8abf7f8515a27ab8cabb1c1c4a3aeddc84078a25 -commit_gh_pages=e6cfb0f03b682b9927c5e25393c3cf6cc4d3b7e0 +commit_master=b92abdcba730f7daefc322cbcd11d5b4bea13cd0 +commit_gh_pages=b754776b80d52727dc4a84a2912b1497b2217923 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From a4d06ef555ddf11fb93159fd585586b556acde6a Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Tue, 21 Nov 2023 14:22:02 +0100 Subject: [PATCH 09/31] update to 1.53.0 (#2247578) --- mozilla-ublock-origin.spec | 5 ++++- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 73c26df..b491e08 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.52.2 +Version: 1.53.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Tue Nov 21 2023 Dominik Mierzejewski - 1.53.0-1 +- update to 1.53.0 (#2247578) + * Fri Sep 29 2023 Dominik Mierzejewski - 1.52.2-1 - update to 1.52.2 (#2238126) diff --git a/sources b/sources index 7aae05d..937efd2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.52.2.tar.gz) = 616d187e99b4744854cdd97c0e41193b92c9c612f308e980afee4dda23d3ca7fe4fbf9d61e0e25fcb625bec1eb4c1da2277c291364b52c1126715cd4b61531fb -SHA512 (uBlock-1.52.2.tar.gz) = 02deb47dcf14ff6688d095982030ff301be95af1942b690e01862bc8a8ce4c6e868730f5f850971ca08d6a2977a2e9c14ec062b7ce093009defd5b1c1562ed9d +SHA512 (uAssets-1.53.0.tar.gz) = db06c76c18a17e442efdba86def5a1246cb0a77c93566a5a8ae9f017ecaafb1ef4ef8660a1dbabc3449beca1f92253197ac9a16c6c51ecea2151424ac6514754 +SHA512 (uBlock-1.53.0.tar.gz) = cd479805061648ca425c690c7237441bb16392bf058b11c0739b5e0539feb2c7c3b0e21b9a9f5456a14f5c8742c092ff989c3d1d67f6bfadcae76dba8e1f8706 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index c51fd76..008ed0e 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=b92abdcba730f7daefc322cbcd11d5b4bea13cd0 -commit_gh_pages=b754776b80d52727dc4a84a2912b1497b2217923 +commit_master=908d3753dc41e5339f26c104071bb3c8bc3d7e5a +commit_gh_pages=415f32afe7e63a734c2c068c5fe151aa3f6daa40 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 08984b0e87161a54b4fc9f56e59449a64eca9d6b Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Tue, 28 Nov 2023 13:18:54 +0100 Subject: [PATCH 10/31] update to 1.54.0 (#2251068) --- mozilla-ublock-origin.spec | 5 ++++- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index b491e08..5b86f05 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.53.0 +Version: 1.54.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Tue Nov 28 2023 Dominik Mierzejewski - 1.54.0-1 +- update to 1.54.0 (#2251068) + * Tue Nov 21 2023 Dominik Mierzejewski - 1.53.0-1 - update to 1.53.0 (#2247578) diff --git a/sources b/sources index 937efd2..d92dab4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.53.0.tar.gz) = db06c76c18a17e442efdba86def5a1246cb0a77c93566a5a8ae9f017ecaafb1ef4ef8660a1dbabc3449beca1f92253197ac9a16c6c51ecea2151424ac6514754 -SHA512 (uBlock-1.53.0.tar.gz) = cd479805061648ca425c690c7237441bb16392bf058b11c0739b5e0539feb2c7c3b0e21b9a9f5456a14f5c8742c092ff989c3d1d67f6bfadcae76dba8e1f8706 +SHA512 (uAssets-1.54.0.tar.gz) = efbc1f317ba205407f0943d327a6dcf2f1d417ea6ec33cb57113d679f132982845b51c6fe5cbabdbeedb1965be1a0ae42f4936010d45120cd311eae2dd7a6795 +SHA512 (uBlock-1.54.0.tar.gz) = 388453c24c9af3adbfc57d58514dbeb9ac4394a69c37037db35cd4b9ce9a0103af1d0b986a882df3291777de33a58ef5ceb2793cad3bbb05dc4fd59abf03f35f diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 008ed0e..5aed4b4 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=908d3753dc41e5339f26c104071bb3c8bc3d7e5a -commit_gh_pages=415f32afe7e63a734c2c068c5fe151aa3f6daa40 +commit_master=8ddfc42ba36e8a84b42af9dfb635cb1c0fd19982 +commit_gh_pages=308f134cde53e991f519be82203006622e07d696 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 19ba1a7b1d636ddb4f78c95604f94de734553670 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 08:41:52 +0000 Subject: [PATCH 11/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 1f85d9b..7bf907b 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -7,7 +7,7 @@ Name: mozilla-ublock-origin Version: 1.54.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3 and MIT and OFL and Unlicense @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.54.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Nov 28 2023 Dominik Mierzejewski - 1.54.0-1 - update to 1.54.0 (#2251068) From 36da233f607a24ce53ece3cf1159bac3ca4ba7eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 08:08:29 +0000 Subject: [PATCH 12/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 7bf907b..1a1b112 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -7,7 +7,7 @@ Name: mozilla-ublock-origin Version: 1.54.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An efficient blocker for Firefox License: GPLv3 and MIT and OFL and Unlicense @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.54.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.54.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From bc6b4b27080f20791e284989a84cb25b0e3c13e6 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 6 Mar 2024 12:38:26 +0100 Subject: [PATCH 13/31] update to 1.56.0 (#2256730) --- mozilla-ublock-origin.spec | 5 ++++- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 5b86f05..4844beb 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.54.0 +Version: 1.56.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Wed Mar 06 2024 Dominik Mierzejewski - 1.56.0-1 +- update to 1.56.0 (#2256730) + * Tue Nov 28 2023 Dominik Mierzejewski - 1.54.0-1 - update to 1.54.0 (#2251068) diff --git a/sources b/sources index d92dab4..6214956 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.54.0.tar.gz) = efbc1f317ba205407f0943d327a6dcf2f1d417ea6ec33cb57113d679f132982845b51c6fe5cbabdbeedb1965be1a0ae42f4936010d45120cd311eae2dd7a6795 -SHA512 (uBlock-1.54.0.tar.gz) = 388453c24c9af3adbfc57d58514dbeb9ac4394a69c37037db35cd4b9ce9a0103af1d0b986a882df3291777de33a58ef5ceb2793cad3bbb05dc4fd59abf03f35f +SHA512 (uAssets-1.56.0.tar.gz) = 631f6995c0131abd7901da516e12108ede9a0d50796061592821ac762b5185c1086e47cc29bfa91184590035c3a1c2d95c32d63bac2f0cc22896a10f8d07a67e +SHA512 (uBlock-1.56.0.tar.gz) = acb7d75058aababae8811580b720cea2697dc096144d1388acee6e3c486184e091d3aa91d1d71b47097329b0654904700434d339e7e76c7c1fe4de99a912e617 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 5aed4b4..fde8764 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=8ddfc42ba36e8a84b42af9dfb635cb1c0fd19982 -commit_gh_pages=308f134cde53e991f519be82203006622e07d696 +commit_master=c192966530cad92ed41fce38a7c5e7262d291b22 +commit_gh_pages=0e089e6ee827063bb63f955fd6b4bfabf275bbf4 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From b2539175b71cb4e27fff1b709f499c6a3a3119b1 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 5 Apr 2024 23:16:25 +0200 Subject: [PATCH 14/31] update to 1.57.0 (#2272273) --- mozilla-ublock-origin.spec | 5 ++++- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 4844beb..47e1727 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.56.0 +Version: 1.57.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Fri Apr 05 2024 Dominik Mierzejewski - 1.57.0-1 +- update to 1.57.0 (#2272273) + * Wed Mar 06 2024 Dominik Mierzejewski - 1.56.0-1 - update to 1.56.0 (#2256730) diff --git a/sources b/sources index 6214956..07b9fbf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.56.0.tar.gz) = 631f6995c0131abd7901da516e12108ede9a0d50796061592821ac762b5185c1086e47cc29bfa91184590035c3a1c2d95c32d63bac2f0cc22896a10f8d07a67e -SHA512 (uBlock-1.56.0.tar.gz) = acb7d75058aababae8811580b720cea2697dc096144d1388acee6e3c486184e091d3aa91d1d71b47097329b0654904700434d339e7e76c7c1fe4de99a912e617 +SHA512 (uAssets-1.57.0.tar.gz) = b47ad67d1e8bd28146711e0166e5ec8a1fb26eed41f8e957d07297cd5ffc48c0a534d8407f7f9724da2e44e1736556481eaa1772fead16a68caf01ca83e91bce +SHA512 (uBlock-1.57.0.tar.gz) = 2e5f9e38763e1f646b90eaee8fd9441bc40f42dec1014d44f8bea92718a0cb40d0183d189dd06868897ce6c3d19e194dbe9bd8e83f0d75bf25be009a4684d50b diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index fde8764..c274ebd 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=c192966530cad92ed41fce38a7c5e7262d291b22 -commit_gh_pages=0e089e6ee827063bb63f955fd6b4bfabf275bbf4 +commit_master=3d0822155990e74a09c6736f3e0891e54b83536a +commit_gh_pages=4e66b02957ec55e4a67797e02e27d8f118f70e0f url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From c7869abaaed8ba7f5682908a96b5d921c6b6560b Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 16 Jun 2024 17:53:55 +0200 Subject: [PATCH 15/31] update to 1.58.0 (#2274003) --- mozilla-ublock-origin.spec | 7 +++++-- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 27a65dd..7aea3ac 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.57.0 +Version: 1.58.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -56,7 +56,7 @@ Provides: bundled(js-hsluv) = 0.1.0 # usually much newer than Fedora's publicsuffix-list package # easy to unbundle, but might affect security # assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat -Provides: bundled(publicsuffix-list) = 20220330 +Provides: bundled(publicsuffix-list) = 20240504 %description An efficient blocker: easy on memory and CPU footprint, and yet can load and @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Sun Jun 16 2024 Dominik Mierzejewski - 1.58.0-1 +- update to 1.58.0 (#2274003) + * Fri Apr 05 2024 Dominik Mierzejewski - 1.57.0-1 - update to 1.57.0 (#2272273) diff --git a/sources b/sources index 07b9fbf..70944a1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.57.0.tar.gz) = b47ad67d1e8bd28146711e0166e5ec8a1fb26eed41f8e957d07297cd5ffc48c0a534d8407f7f9724da2e44e1736556481eaa1772fead16a68caf01ca83e91bce -SHA512 (uBlock-1.57.0.tar.gz) = 2e5f9e38763e1f646b90eaee8fd9441bc40f42dec1014d44f8bea92718a0cb40d0183d189dd06868897ce6c3d19e194dbe9bd8e83f0d75bf25be009a4684d50b +SHA512 (uAssets-1.58.0.tar.gz) = 94744824185ac8b912aa403458670d069f9c2c400632c13592c005ae6663ea28db977ed29cf9fcdf6fd1873a7b0eb07b61aeccf912a4e6548df0eada503abdd7 +SHA512 (uBlock-1.58.0.tar.gz) = 99d1687a31e1866cebcb687ec2237a946c189f62f5fe16ea0179d19f22a276b1d6a2f691bf0f03f0e5ca43eaadd7a6fc09f7c2e3fba0536f22e48221dec627c6 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index c274ebd..ff9e650 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=3d0822155990e74a09c6736f3e0891e54b83536a -commit_gh_pages=4e66b02957ec55e4a67797e02e27d8f118f70e0f +commit_master=175185a665d450ad9b4a6cbca6ba2a92b7a47997 +commit_gh_pages=6a3c1d6abef5adc4d0be13f4b3ad6ca3f52847bf url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From ba671ffda2c7084a95d36e28579d958c0dff7a3c Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 16 Jun 2024 17:54:59 +0200 Subject: [PATCH 16/31] +- update Firefox app ID reference (#2279889) --- mozilla-ublock-origin.metainfo.xml | 2 +- mozilla-ublock-origin.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.metainfo.xml b/mozilla-ublock-origin.metainfo.xml index aa870dc..c319a55 100644 --- a/mozilla-ublock-origin.metainfo.xml +++ b/mozilla-ublock-origin.metainfo.xml @@ -2,7 +2,7 @@ mozilla-ublock-origin - firefox.desktop + org.mozilla.firefox.desktop uBlock Origin for Firefox An efficient blocker for Firefox. Fast and lean. https://github.com/gorhill/uBlock diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 6451750..d8636cf 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -112,6 +112,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %changelog * Sun Jun 16 2024 Dominik Mierzejewski - 1.58.0-1 - update to 1.58.0 (#2274003) +- update Firefox app ID reference (#2279889) * Fri Apr 05 2024 Dominik Mierzejewski - 1.57.0-1 - update to 1.57.0 (#2272273) From dd574d90844d95ef5717928f90befb755a939821 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 18:42:24 +0000 Subject: [PATCH 17/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- mozilla-ublock-origin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index d8636cf..212ae1d 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -7,7 +7,7 @@ Name: mozilla-ublock-origin Version: 1.58.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An efficient blocker for Firefox License: GPLv3 and MIT and OFL and Unlicense @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.58.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jun 16 2024 Dominik Mierzejewski - 1.58.0-1 - update to 1.58.0 (#2274003) - update Firefox app ID reference (#2279889) From da98788b6038883a52f9b736ef5a401b8f10ff5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 11:59:49 +0200 Subject: [PATCH 18/31] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- mozilla-ublock-origin.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 212ae1d..2cdbbc2 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -7,10 +7,11 @@ Name: mozilla-ublock-origin Version: 1.58.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An efficient blocker for Firefox -License: GPLv3 and MIT and OFL and Unlicense +# Automatically converted from old format: GPLv3 and MIT and OFL and Unlicense - review is highly recommended. +License: GPL-3.0-only AND LicenseRef-Callaway-MIT AND LicenseRef-Callaway-OFL AND Unlicense URL: https://github.com/gorhill/uBlock Source0: https://github.com/gorhill/uBlock/archive/%{version}/uBlock-%{version}.tar.gz Source1: mozilla-ublock-origin.metainfo.xml @@ -110,6 +111,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Mon Sep 02 2024 Miroslav Suchý - 1.58.0-3 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 1.58.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 67a3dd13185c3919ff52674e7ae893828ac433d1 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Fri, 11 Oct 2024 14:30:37 +0200 Subject: [PATCH 19/31] update to 1.60.0 (#2302506) --- mozilla-ublock-origin.spec | 5 ++++- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 7aea3ac..75203c2 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.58.0 +Version: 1.60.0 Release: 1%{?dist} Summary: An efficient blocker for Firefox @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog +* Fri Oct 11 2024 Dominik Mierzejewski - 1.60.0-1 +- update to 1.60.0 (#2302506) + * Sun Jun 16 2024 Dominik Mierzejewski - 1.58.0-1 - update to 1.58.0 (#2274003) diff --git a/sources b/sources index 70944a1..d64b699 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.58.0.tar.gz) = 94744824185ac8b912aa403458670d069f9c2c400632c13592c005ae6663ea28db977ed29cf9fcdf6fd1873a7b0eb07b61aeccf912a4e6548df0eada503abdd7 -SHA512 (uBlock-1.58.0.tar.gz) = 99d1687a31e1866cebcb687ec2237a946c189f62f5fe16ea0179d19f22a276b1d6a2f691bf0f03f0e5ca43eaadd7a6fc09f7c2e3fba0536f22e48221dec627c6 +SHA512 (uAssets-1.60.0.tar.gz) = 76b900d2dd352879f1ae242526ec7161fb1d0a053559f1845f9dfc3ce7a8ef76322c0a0c9c7ad46c5d92f44953ae734186e8f6615fc1d98039222e17539a91c3 +SHA512 (uBlock-1.60.0.tar.gz) = 6723e2d337157b5d2a12659ee4389c241cd8581ccec3315c5d54cfd9d2bbedce52e2f76eb05f3a7d0f7ce1591a024ceb6da6b14891b4a27c5b101337f60e90e0 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index ff9e650..8f5bdb6 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=175185a665d450ad9b4a6cbca6ba2a92b7a47997 -commit_gh_pages=6a3c1d6abef5adc4d0be13f4b3ad6ca3f52847bf +commit_master=550100432896041b3d82ca30e146d4cd75b73200 +commit_gh_pages=01f2f97080eb6f33d7e3d48008a3124095b79f43 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 6a780997e2d825393ad1309213f7a9eb7fc147a0 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 24 Nov 2024 12:33:17 +0100 Subject: [PATCH 20/31] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 238 ++++++++++++++++++++++++++++++++++++ mozilla-ublock-origin.spec | 241 +------------------------------------ 2 files changed, 240 insertions(+), 239 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..624990d --- /dev/null +++ b/changelog @@ -0,0 +1,238 @@ +* Fri Oct 11 2024 Dominik Mierzejewski - 1.60.0-1 +- update to 1.60.0 (#2302506) + +* Mon Sep 02 2024 Miroslav Suchý - 1.58.0-3 +- convert license to SPDX + +* Thu Jul 18 2024 Fedora Release Engineering - 1.58.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sun Jun 16 2024 Dominik Mierzejewski - 1.58.0-1 +- update to 1.58.0 (#2274003) +- update Firefox app ID reference (#2279889) + +* Fri Apr 05 2024 Dominik Mierzejewski - 1.57.0-1 +- update to 1.57.0 (#2272273) + +* Wed Mar 06 2024 Dominik Mierzejewski - 1.56.0-1 +- update to 1.56.0 (#2256730) + +* Thu Jan 25 2024 Fedora Release Engineering - 1.54.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.54.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Nov 28 2023 Dominik Mierzejewski - 1.54.0-1 +- update to 1.54.0 (#2251068) + +* Tue Nov 21 2023 Dominik Mierzejewski - 1.53.0-1 +- update to 1.53.0 (#2247578) + +* Fri Sep 29 2023 Dominik Mierzejewski - 1.52.2-1 +- update to 1.52.2 (#2238126) + +* Thu Aug 31 2023 Dominik Mierzejewski - 1.51.0-1 +- update to 1.51.0 (#2224682) +- new bundled dependency: js-beautify + +* Thu Jul 20 2023 Fedora Release Engineering - 1.50.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jun 12 2023 Dominik Mierzejewski - 1.50.0-1 +- update to 1.50.0 (#2213457) +- match upstream build process for uAssets to avoid missing timestamps +- fix deprecated patchN macro usage + +* Sat May 06 2023 Dominik Mierzejewski - 1.49.2-1 +- update to 1.49.2 (#2180855) + +* Mon Mar 13 2023 Dominik Mierzejewski - 1.47.4-1 +- update to 1.47.4 (#2172525) + +* Fri Feb 17 2023 Dominik Mierzejewski - 1.47.0-1 +- update to 1.47.0 (#2170209) + +* Thu Jan 19 2023 Fedora Release Engineering - 1.46.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Dec 27 2022 Dominik Mierzejewski - 1.46.0-1 +- update to 1.46.0 (#2156059) + +* Mon Dec 05 2022 Dominik Mierzejewski - 1.45.2-1 +- update to 1.45.2 (#2141681) + +* Tue Oct 04 2022 Dominik Mierzejewski - 1.44.4-1 +- update to 1.44.4 (#2118741) +- drop obsolete patch + +* Thu Jul 21 2022 Fedora Release Engineering - 1.43.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Dominik Mierzejewski - 1.43.0-1 +- update to 1.43.0 (#2095350) + +* Sun May 22 2022 Dominik Mierzejewski - 1.42.4-1 +- update to 1.42.4 (#2070185) +- new bundled library: hsluv +- fix build with wabt 1.0.25+ + +* Fri Mar 11 2022 Dominik Mierzejewski - 1.41.8-1 +- update to 1.41.8 (#2055291) + +* Tue Feb 15 2022 Dominik Mierzejewski - 1.41.2-1 +- update to 1.41.2 (#2052004) + +* Thu Jan 20 2022 Fedora Release Engineering - 1.40.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jan 14 2022 Dominik Mierzejewski - 1.40.8-1 +- update to 1.40.8 (#2034966) + +* Sat Dec 04 2021 Dominik Mierzejewski - 1.39.2-1 +- update to 1.39.2 (#2025622) + +* Fri Oct 15 2021 Dominik Mierzejewski - 1.38.6-1 +- update to 1.38.6 (#2009380) + +* Tue Sep 21 2021 Dominik Mierzejewski - 1.38.0-1 +- update to 1.38.0 (#2005514) +- drop obsolete patch + +* Wed Jul 28 2021 Dominik Mierzejewski - 1.37.2-1 +- update to 1.37.2 (#1986999) + +* Sat Jul 24 2021 Dominik Mierzejewski - 1.37.0-1 +- update to 1.37.0 (#1985343) + +* Thu Jul 22 2021 Fedora Release Engineering - 1.36.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jul 17 2021 Dominik Mierzejewski - 1.36.2-1 +- update to 1.36.2 (#1979628) + +* Mon Jul 05 2021 Dominik Mierzejewski - 1.36.0-1 +- update to 1.36.0 (#1974010) +- update declared version of bundled publicsuffix-list + +* Tue Jun 08 2021 Dominik Mierzejewski - 1.35.2-1 +- update to 1.35.2 (#1954349) + +* Fri Apr 23 2021 Dominik Mierzejewski - 1.35.0-1 +- update to 1.35.0 (#1946869) + +* Thu Apr 01 2021 Dominik Mierzejewski - 1.34.0-1 +- update to 1.34.0 (#1925264) + +* Tue Feb 02 2021 Dominik Mierzejewski - 1.33.2-1 +- update to 1.33.2 (#1922482) + +* Tue Jan 26 2021 Fedora Release Engineering - 1.32.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 20 2021 Dominik Mierzejewski - 1.32.4-1 +- update to 1.32.4 (#1918447) + +* Thu Aug 20 2020 Dominik Mierzejewski - 1.29.0-1 +- update to 1.29.0 (#1867396) +- optimize lz4 wasm code per upstream docs + +* Thu Aug 06 2020 Dominik Mierzejewski - 1.28.4-2 +- fix invalid JSON after Patch0 (caught by Raymond Hill) + +* Wed Aug 05 2020 Dominik Mierzejewski - 1.28.4-1 +- update to 1.28.4 (#1857445) +- avoid building on big-endian, wabt doesn't work there + +* Tue Jul 28 2020 Fedora Release Engineering - 1.28.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 13 2020 Dominik Mierzejewski - 1.28.2-3 +- add missing explicit BR on python3 + +* Mon Jul 13 2020 Dominik Mierzejewski - 1.28.2-2 +- use python3 in build script explicitly + +* Sun Jul 12 2020 Dominik Mierzejewski - 1.28.2-1 +- update to 1.28.2 (#1835275) +- "build" from upstream "source" directly +- drop non-free components from upstream uAssets tarball + +* Sun May 03 2020 Dominik Mierzejewski - 1.26.2-1 +- update to 1.26.2 (#1825039) + +* Sun Apr 12 2020 Dominik Mierzejewski - 1.26.0-1 +- update to 1.26.0 (#1820622) + +* Sat Mar 14 2020 Dominik Mierzejewski - 1.25.2-1 +- update to 1.25.2 (#1797341) + +* Wed Jan 29 2020 Fedora Release Engineering - 1.24.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Dec 01 2019 Dominik Mierzejewski - 1.24.2-1 +- update to 1.24.2 (#1763778) + +* Sat Sep 28 2019 Dominik Mierzejewski - 1.22.4-1 +- update to 1.22.4 (#1756060) + +* Wed Sep 11 2019 Dominik Mierzejewski - 1.22.2-2 +- fix wrong fileid (was pointing to 1.20.0 instead of 1.22.2) + +* Mon Sep 09 2019 Dominik Mierzejewski - 1.22.2-1 +- update to 1.22.2 (#1713383) + +* Thu Jul 25 2019 Fedora Release Engineering - 1.19.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon May 13 2019 Dominik Mierzejewski - 1.19.2-1 +- update to 1.19.2 (#1689200) + +* Thu Mar 14 2019 Dominik Mierzejewski - 1.18.6-1 +- update to 1.18.6 (#1680421) +- drop conditionals that are true in F26+ + +* Wed Feb 20 2019 Dominik Mierzejewski - 1.18.4-1 +- update to 1.18.4 (#1669295) +- update bundled fontawesome version + +* Fri Feb 01 2019 Fedora Release Engineering - 1.17.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Oct 27 2018 Dominik Mierzejewski - 1.17.2-1 +- update to 1.17.2 + +* Mon Jul 30 2018 Dominik Mierzejewski - 1.16.14-1 +- update to 1.16.14 (#1598265) + +* Fri Jul 13 2018 Fedora Release Engineering - 1.16.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Jun 29 2018 Dominik Mierzejewski - 1.16.12-1 +- update to 1.16.12 (#1567576) + +* Wed May 23 2018 Dominik Mierzejewski - 1.16.6-1 +- update to 1.16.6 (#1567576) +- update bundled codemirror version + +* Fri Apr 13 2018 Dominik Mierzejewski - 1.15.24-1 +- update to 1.15.24 +- use correct path for metainfo file +- update bundled components list and license tag +- include license texts in the standard location, too + +* Tue Feb 20 2018 Dominik Mierzejewski - 1.15.10-1 +- update to 1.15.10 + +* Thu Feb 08 2018 Fedora Release Engineering - 1.14.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Feb 01 2018 Dominik Mierzejewski - 1.14.24-1 +- update to 1.14.24 + +* Fri Dec 29 2017 Dominik 'Rathann' Mierzejewski - 1.14.22-1 +- update to 1.14.22 +- install the appdata metainfo file into correct place + +* Wed Nov 29 2017 Dominik 'Rathann' Mierzejewski - 1.14.18-1 +- Initial package diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index bcc7386..1e6d347 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -7,7 +7,7 @@ Name: mozilla-ublock-origin Version: 1.60.0 -Release: 1%{?dist} +Release: %autorelease Summary: An efficient blocker for Firefox # Automatically converted from old format: GPLv3 and MIT and OFL and Unlicense - review is highly recommended. @@ -111,241 +111,4 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain %{_metainfodir}/%{name}.metainfo.xml %changelog -* Fri Oct 11 2024 Dominik Mierzejewski - 1.60.0-1 -- update to 1.60.0 (#2302506) - -* Mon Sep 02 2024 Miroslav Suchý - 1.58.0-3 -- convert license to SPDX - -* Thu Jul 18 2024 Fedora Release Engineering - 1.58.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sun Jun 16 2024 Dominik Mierzejewski - 1.58.0-1 -- update to 1.58.0 (#2274003) -- update Firefox app ID reference (#2279889) - -* Fri Apr 05 2024 Dominik Mierzejewski - 1.57.0-1 -- update to 1.57.0 (#2272273) - -* Wed Mar 06 2024 Dominik Mierzejewski - 1.56.0-1 -- update to 1.56.0 (#2256730) - -* Thu Jan 25 2024 Fedora Release Engineering - 1.54.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.54.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Nov 28 2023 Dominik Mierzejewski - 1.54.0-1 -- update to 1.54.0 (#2251068) - -* Tue Nov 21 2023 Dominik Mierzejewski - 1.53.0-1 -- update to 1.53.0 (#2247578) - -* Fri Sep 29 2023 Dominik Mierzejewski - 1.52.2-1 -- update to 1.52.2 (#2238126) - -* Thu Aug 31 2023 Dominik Mierzejewski - 1.51.0-1 -- update to 1.51.0 (#2224682) -- new bundled dependency: js-beautify - -* Thu Jul 20 2023 Fedora Release Engineering - 1.50.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Jun 12 2023 Dominik Mierzejewski - 1.50.0-1 -- update to 1.50.0 (#2213457) -- match upstream build process for uAssets to avoid missing timestamps -- fix deprecated patchN macro usage - -* Sat May 06 2023 Dominik Mierzejewski - 1.49.2-1 -- update to 1.49.2 (#2180855) - -* Mon Mar 13 2023 Dominik Mierzejewski - 1.47.4-1 -- update to 1.47.4 (#2172525) - -* Fri Feb 17 2023 Dominik Mierzejewski - 1.47.0-1 -- update to 1.47.0 (#2170209) - -* Thu Jan 19 2023 Fedora Release Engineering - 1.46.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Dec 27 2022 Dominik Mierzejewski - 1.46.0-1 -- update to 1.46.0 (#2156059) - -* Mon Dec 05 2022 Dominik Mierzejewski - 1.45.2-1 -- update to 1.45.2 (#2141681) - -* Tue Oct 04 2022 Dominik Mierzejewski - 1.44.4-1 -- update to 1.44.4 (#2118741) -- drop obsolete patch - -* Thu Jul 21 2022 Fedora Release Engineering - 1.43.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Dominik Mierzejewski - 1.43.0-1 -- update to 1.43.0 (#2095350) - -* Sun May 22 2022 Dominik Mierzejewski - 1.42.4-1 -- update to 1.42.4 (#2070185) -- new bundled library: hsluv -- fix build with wabt 1.0.25+ - -* Fri Mar 11 2022 Dominik Mierzejewski - 1.41.8-1 -- update to 1.41.8 (#2055291) - -* Tue Feb 15 2022 Dominik Mierzejewski - 1.41.2-1 -- update to 1.41.2 (#2052004) - -* Thu Jan 20 2022 Fedora Release Engineering - 1.40.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jan 14 2022 Dominik Mierzejewski - 1.40.8-1 -- update to 1.40.8 (#2034966) - -* Sat Dec 04 2021 Dominik Mierzejewski - 1.39.2-1 -- update to 1.39.2 (#2025622) - -* Fri Oct 15 2021 Dominik Mierzejewski - 1.38.6-1 -- update to 1.38.6 (#2009380) - -* Tue Sep 21 2021 Dominik Mierzejewski - 1.38.0-1 -- update to 1.38.0 (#2005514) -- drop obsolete patch - -* Wed Jul 28 2021 Dominik Mierzejewski - 1.37.2-1 -- update to 1.37.2 (#1986999) - -* Sat Jul 24 2021 Dominik Mierzejewski - 1.37.0-1 -- update to 1.37.0 (#1985343) - -* Thu Jul 22 2021 Fedora Release Engineering - 1.36.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 17 2021 Dominik Mierzejewski - 1.36.2-1 -- update to 1.36.2 (#1979628) - -* Mon Jul 05 2021 Dominik Mierzejewski - 1.36.0-1 -- update to 1.36.0 (#1974010) -- update declared version of bundled publicsuffix-list - -* Tue Jun 08 2021 Dominik Mierzejewski - 1.35.2-1 -- update to 1.35.2 (#1954349) - -* Fri Apr 23 2021 Dominik Mierzejewski - 1.35.0-1 -- update to 1.35.0 (#1946869) - -* Thu Apr 01 2021 Dominik Mierzejewski - 1.34.0-1 -- update to 1.34.0 (#1925264) - -* Tue Feb 02 2021 Dominik Mierzejewski - 1.33.2-1 -- update to 1.33.2 (#1922482) - -* Tue Jan 26 2021 Fedora Release Engineering - 1.32.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jan 20 2021 Dominik Mierzejewski - 1.32.4-1 -- update to 1.32.4 (#1918447) - -* Thu Aug 20 2020 Dominik Mierzejewski - 1.29.0-1 -- update to 1.29.0 (#1867396) -- optimize lz4 wasm code per upstream docs - -* Thu Aug 06 2020 Dominik Mierzejewski - 1.28.4-2 -- fix invalid JSON after Patch0 (caught by Raymond Hill) - -* Wed Aug 05 2020 Dominik Mierzejewski - 1.28.4-1 -- update to 1.28.4 (#1857445) -- avoid building on big-endian, wabt doesn't work there - -* Tue Jul 28 2020 Fedora Release Engineering - 1.28.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 13 2020 Dominik Mierzejewski - 1.28.2-3 -- add missing explicit BR on python3 - -* Mon Jul 13 2020 Dominik Mierzejewski - 1.28.2-2 -- use python3 in build script explicitly - -* Sun Jul 12 2020 Dominik Mierzejewski - 1.28.2-1 -- update to 1.28.2 (#1835275) -- "build" from upstream "source" directly -- drop non-free components from upstream uAssets tarball - -* Sun May 03 2020 Dominik Mierzejewski - 1.26.2-1 -- update to 1.26.2 (#1825039) - -* Sun Apr 12 2020 Dominik Mierzejewski - 1.26.0-1 -- update to 1.26.0 (#1820622) - -* Sat Mar 14 2020 Dominik Mierzejewski - 1.25.2-1 -- update to 1.25.2 (#1797341) - -* Wed Jan 29 2020 Fedora Release Engineering - 1.24.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sun Dec 01 2019 Dominik Mierzejewski - 1.24.2-1 -- update to 1.24.2 (#1763778) - -* Sat Sep 28 2019 Dominik Mierzejewski - 1.22.4-1 -- update to 1.22.4 (#1756060) - -* Wed Sep 11 2019 Dominik Mierzejewski - 1.22.2-2 -- fix wrong fileid (was pointing to 1.20.0 instead of 1.22.2) - -* Mon Sep 09 2019 Dominik Mierzejewski - 1.22.2-1 -- update to 1.22.2 (#1713383) - -* Thu Jul 25 2019 Fedora Release Engineering - 1.19.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon May 13 2019 Dominik Mierzejewski - 1.19.2-1 -- update to 1.19.2 (#1689200) - -* Thu Mar 14 2019 Dominik Mierzejewski - 1.18.6-1 -- update to 1.18.6 (#1680421) -- drop conditionals that are true in F26+ - -* Wed Feb 20 2019 Dominik Mierzejewski - 1.18.4-1 -- update to 1.18.4 (#1669295) -- update bundled fontawesome version - -* Fri Feb 01 2019 Fedora Release Engineering - 1.17.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Oct 27 2018 Dominik Mierzejewski - 1.17.2-1 -- update to 1.17.2 - -* Mon Jul 30 2018 Dominik Mierzejewski - 1.16.14-1 -- update to 1.16.14 (#1598265) - -* Fri Jul 13 2018 Fedora Release Engineering - 1.16.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Jun 29 2018 Dominik Mierzejewski - 1.16.12-1 -- update to 1.16.12 (#1567576) - -* Wed May 23 2018 Dominik Mierzejewski - 1.16.6-1 -- update to 1.16.6 (#1567576) -- update bundled codemirror version - -* Fri Apr 13 2018 Dominik Mierzejewski - 1.15.24-1 -- update to 1.15.24 -- use correct path for metainfo file -- update bundled components list and license tag -- include license texts in the standard location, too - -* Tue Feb 20 2018 Dominik Mierzejewski - 1.15.10-1 -- update to 1.15.10 - -* Thu Feb 08 2018 Fedora Release Engineering - 1.14.24-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Feb 01 2018 Dominik Mierzejewski - 1.14.24-1 -- update to 1.14.24 - -* Fri Dec 29 2017 Dominik 'Rathann' Mierzejewski - 1.14.22-1 -- update to 1.14.22 -- install the appdata metainfo file into correct place - -* Wed Nov 29 2017 Dominik 'Rathann' Mierzejewski - 1.14.18-1 -- Initial package +%autochangelog From f4feb96e93977982ea5333bfefa2d9aa7dd4557f Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 24 Nov 2024 12:44:35 +0100 Subject: [PATCH 21/31] fix Firefox desktop ID --- mozilla-ublock-origin.metainfo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mozilla-ublock-origin.metainfo.xml b/mozilla-ublock-origin.metainfo.xml index c319a55..3e84206 100644 --- a/mozilla-ublock-origin.metainfo.xml +++ b/mozilla-ublock-origin.metainfo.xml @@ -2,7 +2,7 @@ mozilla-ublock-origin - org.mozilla.firefox.desktop + org.mozilla.firefox uBlock Origin for Firefox An efficient blocker for Firefox. Fast and lean. https://github.com/gorhill/uBlock From 9530c8607677ad2a4d7116775105683bab8cd14e Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 24 Nov 2024 12:50:09 +0100 Subject: [PATCH 22/31] update to 1.61.2 (resolves rhbz#2324274) --- mozilla-ublock-origin.spec | 2 +- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 1e6d347..c72aa65 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.60.0 +Version: 1.61.2 Release: %autorelease Summary: An efficient blocker for Firefox diff --git a/sources b/sources index d64b699..a20a312 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.60.0.tar.gz) = 76b900d2dd352879f1ae242526ec7161fb1d0a053559f1845f9dfc3ce7a8ef76322c0a0c9c7ad46c5d92f44953ae734186e8f6615fc1d98039222e17539a91c3 -SHA512 (uBlock-1.60.0.tar.gz) = 6723e2d337157b5d2a12659ee4389c241cd8581ccec3315c5d54cfd9d2bbedce52e2f76eb05f3a7d0f7ce1591a024ceb6da6b14891b4a27c5b101337f60e90e0 +SHA512 (uAssets-1.61.2.tar.gz) = 2a13e8ecdc04e3b6dcce73d17db83233e5a35c0ff2088ca77c73fff46f0f4fed5ef20b267a636641f678fd2ef744bd9e0c5dfe612138b8a77bce8e7344696103 +SHA512 (uBlock-1.61.2.tar.gz) = c2938dbe402ce5e960c9e1cca5fae88ea0b51ef6eef0ee396a07f0244e90eed0274e7175539d81973460d3377b5a05483d918836f6b77c9dcaecef6ba1445dfc diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 8f5bdb6..589d385 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=550100432896041b3d82ca30e146d4cd75b73200 -commit_gh_pages=01f2f97080eb6f33d7e3d48008a3124095b79f43 +commit_master=3010690024ff55b8c58cb7df4f426d0206629ad2 +commit_gh_pages=88d3031866a6dc4727905e7fa28286d3e8008915 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 28b60c69b9d115897f4f5bf1b881f05486452b09 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 12 Jan 2025 12:11:11 +0100 Subject: [PATCH 23/31] update to 1.62.0 (resolves rhbz#2335170) --- mozilla-ublock-origin.spec | 2 +- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index c72aa65..d4c0cd7 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.61.2 +Version: 1.62.0 Release: %autorelease Summary: An efficient blocker for Firefox diff --git a/sources b/sources index a20a312..a210e32 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.61.2.tar.gz) = 2a13e8ecdc04e3b6dcce73d17db83233e5a35c0ff2088ca77c73fff46f0f4fed5ef20b267a636641f678fd2ef744bd9e0c5dfe612138b8a77bce8e7344696103 -SHA512 (uBlock-1.61.2.tar.gz) = c2938dbe402ce5e960c9e1cca5fae88ea0b51ef6eef0ee396a07f0244e90eed0274e7175539d81973460d3377b5a05483d918836f6b77c9dcaecef6ba1445dfc +SHA512 (uAssets-1.62.0.tar.gz) = 3ad60e530a4e0ee349cf4b7f5bc033d068544e40b7bde5ef2eaf1a40dedab8e02a2b7ceaadb42cdca67e08de49f57b3c24a6e825a518ef308dd9ed583739fcfb +SHA512 (uBlock-1.62.0.tar.gz) = cd9702b9037dc84a4420936a3ba65fb1d5c98e9c235dd5196fddcc0c78f29cba27e5f6cd554140138c91b2968038dd4e0f483ded79d68b6a989c56ae0062acf5 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 589d385..824ebb3 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=3010690024ff55b8c58cb7df4f426d0206629ad2 -commit_gh_pages=88d3031866a6dc4727905e7fa28286d3e8008915 +commit_master=7fb1c293e63a102fc0d83f6ce9d2327d33940e6e +commit_gh_pages=2e78e9651f855f36fc3d0d7f6dbcf8634c06f9ef url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 5865dd0ce539a76e69e314ff73843f9b67b3fd9a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 19:09:48 +0000 Subject: [PATCH 24/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 5341d8185f7a639924cd2790cc2c8ee264aad91c Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Fri, 4 Apr 2025 17:16:52 +0200 Subject: [PATCH 25/31] update to 1.63.2 (resolves rhbz#2353115) --- mozilla-ublock-origin.spec | 2 +- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index d4c0cd7..ee3a5bf 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.62.0 +Version: 1.63.2 Release: %autorelease Summary: An efficient blocker for Firefox diff --git a/sources b/sources index a210e32..803d1e6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.62.0.tar.gz) = 3ad60e530a4e0ee349cf4b7f5bc033d068544e40b7bde5ef2eaf1a40dedab8e02a2b7ceaadb42cdca67e08de49f57b3c24a6e825a518ef308dd9ed583739fcfb -SHA512 (uBlock-1.62.0.tar.gz) = cd9702b9037dc84a4420936a3ba65fb1d5c98e9c235dd5196fddcc0c78f29cba27e5f6cd554140138c91b2968038dd4e0f483ded79d68b6a989c56ae0062acf5 +SHA512 (uAssets-1.63.2.tar.gz) = f586c59e883c28a2b3664e5cebf120fec1fbf307e8c8c6fa0ed9e54cd12798c06336a0dbd8e0887131c426533764afe2432c046a18a83ff6a9f6dc1606ee1d06 +SHA512 (uBlock-1.63.2.tar.gz) = 5687617aa33cced43bde19de857f298d928a328d16f21ae82903f41caa38a7794495626b2731201107fefc08c53c9dcc40d056760c6de051a81839b9645f0d30 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 824ebb3..00029bc 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=7fb1c293e63a102fc0d83f6ce9d2327d33940e6e -commit_gh_pages=2e78e9651f855f36fc3d0d7f6dbcf8634c06f9ef +commit_master=14dfe816109abe31aea2ea5ee4d318cf701329cb +commit_gh_pages=b8c1c9fc1eb7ce44b664f5a8d3f369f406fd6326 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 70ca72a018b6eb423f9eb8d5b3e716f1f34ec659 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 19 May 2025 19:51:04 +0200 Subject: [PATCH 26/31] update to 1.64.0 (resolves rhbz#2366177) - fixes CVE-2025-4215 --- mozilla-ublock-origin.spec | 2 +- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index ee3a5bf..8be779b 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.63.2 +Version: 1.64.0 Release: %autorelease Summary: An efficient blocker for Firefox diff --git a/sources b/sources index 803d1e6..82d4295 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.63.2.tar.gz) = f586c59e883c28a2b3664e5cebf120fec1fbf307e8c8c6fa0ed9e54cd12798c06336a0dbd8e0887131c426533764afe2432c046a18a83ff6a9f6dc1606ee1d06 -SHA512 (uBlock-1.63.2.tar.gz) = 5687617aa33cced43bde19de857f298d928a328d16f21ae82903f41caa38a7794495626b2731201107fefc08c53c9dcc40d056760c6de051a81839b9645f0d30 +SHA512 (uAssets-1.64.0.tar.gz) = 9560894223b86859fd9f04b7af3c8800957f9d86f41a4139f77e4e39319fb4b858995f0ecf8ba086623bde549915ac75757dba7f11a2480f19a1b849ab503acf +SHA512 (uBlock-1.64.0.tar.gz) = 72fb54d093002cdc81befd0d0cbfd82013ceec519195a0e8c75a9bbf31a3e5074b7521432a7bcf92b1ddf3cc689d7e60c3faf41db202226f4ed65198074e3bfc diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 00029bc..abba7c7 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=14dfe816109abe31aea2ea5ee4d318cf701329cb -commit_gh_pages=b8c1c9fc1eb7ce44b664f5a8d3f369f406fd6326 +commit_master=ec20c13add56b1fded7892dab2fe8ffaa2e21e58 +commit_gh_pages=005ab2b48f5f3cb26aa737bdbb45516e0251ff7b url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 83e1978771aea8e7e4d1ed9b8927a2891127a818 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Fri, 11 Jul 2025 23:47:45 +0200 Subject: [PATCH 27/31] update to 1.65.0 (resolves rhbz#2379467) --- mozilla-ublock-origin.spec | 2 +- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 8be779b..66f42a9 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.64.0 +Version: 1.65.0 Release: %autorelease Summary: An efficient blocker for Firefox diff --git a/sources b/sources index 82d4295..5d5c6ea 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.64.0.tar.gz) = 9560894223b86859fd9f04b7af3c8800957f9d86f41a4139f77e4e39319fb4b858995f0ecf8ba086623bde549915ac75757dba7f11a2480f19a1b849ab503acf -SHA512 (uBlock-1.64.0.tar.gz) = 72fb54d093002cdc81befd0d0cbfd82013ceec519195a0e8c75a9bbf31a3e5074b7521432a7bcf92b1ddf3cc689d7e60c3faf41db202226f4ed65198074e3bfc +SHA512 (uAssets-1.65.0.tar.gz) = debe265b77108210136f13fb50dfdd2b43f039275b0b9b7eff1853bd94c746c2267107a45d72a72c577a484f5c79a276926442c538dbe314e41e7d8370167574 +SHA512 (uBlock-1.65.0.tar.gz) = 61c80541eb646872ce3e70228134ccc3e33bea433f1005c43e3d2ccd26377a539f593ab244437f4679baace0482b975e626c0649f5fbdec80df6045a88fc3d7d diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index abba7c7..38a0496 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=ec20c13add56b1fded7892dab2fe8ffaa2e21e58 -commit_gh_pages=005ab2b48f5f3cb26aa737bdbb45516e0251ff7b +commit_master=80e93b0e5b8d4018100110fdf13c0093e6e511bd +commit_gh_pages=e7ed6bf236adeac4a95807f5b3fb985800e52b0f url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 08b5966f7b55a1376b4b92e0c3123e8dd52f8fc8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:22:33 +0000 Subject: [PATCH 28/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From f500f9fbb2fb831b55a5153d79f6fa4bedf17ac2 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Sat, 27 Sep 2025 13:21:12 +0200 Subject: [PATCH 29/31] update to 1.66.4 (resolves rhbz#2393682) --- mozilla-ublock-origin.spec | 2 +- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 66f42a9..f6e1aed 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.65.0 +Version: 1.66.4 Release: %autorelease Summary: An efficient blocker for Firefox diff --git a/sources b/sources index 5d5c6ea..10fa125 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.65.0.tar.gz) = debe265b77108210136f13fb50dfdd2b43f039275b0b9b7eff1853bd94c746c2267107a45d72a72c577a484f5c79a276926442c538dbe314e41e7d8370167574 -SHA512 (uBlock-1.65.0.tar.gz) = 61c80541eb646872ce3e70228134ccc3e33bea433f1005c43e3d2ccd26377a539f593ab244437f4679baace0482b975e626c0649f5fbdec80df6045a88fc3d7d +SHA512 (uAssets-1.66.4.tar.gz) = d753ef6fd30af7affbcf1f31a771b9cfb4b3c3237478983b5044caed7fa741089b6cbdb835050801314d57d8efa22633611acc063f77dd420439ad4b482683b7 +SHA512 (uBlock-1.66.4.tar.gz) = 13d8ea19077e68d1a50c057303784259498295089b5db21b125df09c5e1c715b34067f580107655f13fa85427a49d0e2b5760adc6851e90ea8da4a3d30a0ad60 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 38a0496..c78b837 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=80e93b0e5b8d4018100110fdf13c0093e6e511bd -commit_gh_pages=e7ed6bf236adeac4a95807f5b3fb985800e52b0f +commit_master=fc274fd22fa64db0aef0141a0c6ace8964d89cd0 +commit_gh_pages=b1c72587f3f652645a4a56f7ad3315b6e561360a url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From 37b32640c8144dc4f9a67b029d1936a1626f4275 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sat, 8 Nov 2025 19:36:35 +0100 Subject: [PATCH 30/31] update to 1.67.0 (resolves rhbz#2404220) --- mozilla-ublock-origin.spec | 2 +- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index f6e1aed..3d6184a 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.66.4 +Version: 1.67.0 Release: %autorelease Summary: An efficient blocker for Firefox diff --git a/sources b/sources index 10fa125..0e54644 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.66.4.tar.gz) = d753ef6fd30af7affbcf1f31a771b9cfb4b3c3237478983b5044caed7fa741089b6cbdb835050801314d57d8efa22633611acc063f77dd420439ad4b482683b7 -SHA512 (uBlock-1.66.4.tar.gz) = 13d8ea19077e68d1a50c057303784259498295089b5db21b125df09c5e1c715b34067f580107655f13fa85427a49d0e2b5760adc6851e90ea8da4a3d30a0ad60 +SHA512 (uAssets-1.67.0.tar.gz) = aae8328fc9e6f240a9c4230a780cca7d43657a1f0d542dbbbcbc568db0b9fa4b863629a57ad250c423365f192f7d2a9521fbef304e070853fbcffc281aa26915 +SHA512 (uBlock-1.67.0.tar.gz) = 02565b800f6dbae550793a2f9bc46c2925e8d12bf66f416044ccb48eff668ca20e28abc7ac596c8fd9bec5361bf7926dc0b61620586628dbc6fa2aa165104949 diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index c78b837..961d35f 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=fc274fd22fa64db0aef0141a0c6ace8964d89cd0 -commit_gh_pages=b1c72587f3f652645a4a56f7ad3315b6e561360a +commit_master=aae6be054144902879205a6bd90f62ab14198e61 +commit_gh_pages=6e6201e63c48190f4c6c4b622c4a7e48ca531469 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp" From b2b67543cd499efa81eb6d66be960c33a733b1b2 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 27 Nov 2025 21:06:46 +0100 Subject: [PATCH 31/31] update to 1.68.0 (resolves rhbz#2417502) --- mozilla-ublock-origin.spec | 2 +- sources | 4 ++-- uAssets-mktarball.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec index 3d6184a..f42be5d 100644 --- a/mozilla-ublock-origin.spec +++ b/mozilla-ublock-origin.spec @@ -6,7 +6,7 @@ %global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id} Name: mozilla-ublock-origin -Version: 1.67.0 +Version: 1.68.0 Release: %autorelease Summary: An efficient blocker for Firefox diff --git a/sources b/sources index 0e54644..0a46ef1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uAssets-1.67.0.tar.gz) = aae8328fc9e6f240a9c4230a780cca7d43657a1f0d542dbbbcbc568db0b9fa4b863629a57ad250c423365f192f7d2a9521fbef304e070853fbcffc281aa26915 -SHA512 (uBlock-1.67.0.tar.gz) = 02565b800f6dbae550793a2f9bc46c2925e8d12bf66f416044ccb48eff668ca20e28abc7ac596c8fd9bec5361bf7926dc0b61620586628dbc6fa2aa165104949 +SHA512 (uAssets-1.68.0.tar.gz) = 360fa9d0b32a94711323db40f4ee16533f5b6f625ab893d740b5bed4084aa0dbcd97f03c207f02d44644fa6322be564eef09dd1ce64d555f442dfda00ff3a077 +SHA512 (uBlock-1.68.0.tar.gz) = ec4c3c956abf0e1cbf813a8e19f60a461bc04ea3644e7f0bd5fce25c0dbe6d45ede67871135ed49e2ab507ac2fe294b945d2dd8dcce14c3fddfcfad6a16de96d diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh index 961d35f..cdc7123 100755 --- a/uAssets-mktarball.sh +++ b/uAssets-mktarball.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) name=uAssets version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec) -commit_master=aae6be054144902879205a6bd90f62ab14198e61 -commit_gh_pages=6e6201e63c48190f4c6c4b622c4a7e48ca531469 +commit_master=5f9f16404dce279a66b533edbccf869196b8d2b1 +commit_gh_pages=d975a96651a13bf8649bd16ee293e66b731aebc7 url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_master}/${name}-${commit_master}.tar.gz url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_pages}/${name}-${commit_gh_pages}.tar.gz pushd "$tmp"