From a581cb5025910f417c7aad61d2446b34b6d6acd2 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Wed, 15 Sep 2021 16:10:21 -0400 Subject: use new git tracking repo --- newmoon/newmoon.spec | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'newmoon/newmoon.spec') diff --git a/newmoon/newmoon.spec b/newmoon/newmoon.spec index 5d22a22..df5710b 100644 --- a/newmoon/newmoon.spec +++ b/newmoon/newmoon.spec @@ -1,12 +1,13 @@ -%global tarballdir pale-moon %global dummy_package 0 %global appname newmoon %global prettyname Newmoon web browser %global stackrpms_custom 1 # derive from inside the source tree or from https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases # git submodule | awk -v "name=platform" '$2 == name {gsub("-","",$1); print $1}' -%global submodule_platform_tag RELBASE_20210817 +#%%global submodule_platform_tag RELBASE_20210817 %global badname palemoon +%global git_commit 05056e7cd4b3b8b3b4d6248aafb4c10744f00538 +%global tarballdir %{badname}-%{git_commit} # additional repos to get python27 and devtoolset-7 # for el6 and el7: Software Collection;, for x86_64 only @@ -43,14 +44,15 @@ Name: newmoon Name: newmoon %endif Summary: Newmoon web browser -Version: 29.4.0 +Version: 29.4.1 Release: 1 Group: Networking/Web License: MPLv2.0 URL: http://linux.palemoon.org/ -Source0: https://repo.palemoon.org/MoonChildProductions/Pale-Moon/archive/%{version}_Release.tar.gz -Source1: https://repo.palemoon.org/MoonchildProductions/UXP/archive/%{submodule_platform_tag}.tar.gz +#Source0: https://repo.palemoon.org/MoonChildProductions/Pale-Moon/archive/%%{version}_Release.tar.gz +Source0: https://gitlab.com/opensource-tracking/palemoon/-/archive/%{git_commit}/palemoon-%{git_commit}.tar.gz +#Source1: https://repo.palemoon.org/MoonchildProductions/UXP/archive/%%{submodule_platform_tag}.tar.gz Source2: newmoon-mozconfig Source3: newmoon.desktop Source4: newmoon-mimeinfo.xml @@ -61,7 +63,7 @@ Patch0: small-icons.patch Patch1: pm-fedora.patch Patch2: pm-to-nm.patch %endif -Packager: Bgstack15 +Packager: B. Stack %if "%{?scl_env}" != "" BuildRequires: %{scl_buildreq} @@ -110,8 +112,8 @@ and themes to make the browser truly your own. %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') %prep -%setup -q -n %{tarballdir} -tar -C platform --strip-components=1 -zxf %{SOURCE1} # git submodule +setup -q -n %{tarballdir} +#tar -C platform --strip-components=1 -zxf %%{SOURCE1} # git submodule %{__cp} %{SOURCE2} ./.mozconfig %if 0%{?fedora} >= 30 sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig @@ -298,6 +300,10 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %doc AUTHORS LICENSE %changelog +* Wed Sep 15 2021 B. Stack - 29.4.1-1 +- Use new intermediate git source because upstream + has stopped sharing git. + * Tue Aug 17 2021 B. Stack - 29.4.0-1 - update version -- cgit