From 418c394117b2b75cf41d379f83987d959b57e688 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sun, 22 May 2022 11:39:41 -0400 Subject: nm 31.0.0 rpm rc1 --- newmoon/newmoon.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'newmoon/newmoon.spec') diff --git a/newmoon/newmoon.spec b/newmoon/newmoon.spec index 7bd8079..f03a57b 100644 --- a/newmoon/newmoon.spec +++ b/newmoon/newmoon.spec @@ -7,7 +7,7 @@ #%%global submodule_platform_tag RELBASE_20210817 %global badname palemoon %global git_commit db5ee3c1968212742b4ed8b9883069ea7b03f0e1 -%global tarballdir %{badname}-%{git_commit} +%global tarballdir pale-moon # additional repos to get python27 and devtoolset-7 # for el6 and el7: Software Collection;, for x86_64 only @@ -32,7 +32,7 @@ %define scl_buildreq devtoolset-7-toolchain %endif -# suppress binary strippping on el6 which fails for some reason +# suppress binary stripping on el6 which fails for some reason %if 0%{?el6} %global __os_install_post %{nil} %endif @@ -44,14 +44,14 @@ Name: newmoon Name: newmoon %endif Summary: Newmoon web browser -Version: 29.4.4 +Version: 31.0.0 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 -Source0: https://gitlab.com/opensource-tracking/palemoon/-/archive/%{git_commit}/palemoon-%{git_commit}.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 @@ -310,6 +310,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %doc AUTHORS LICENSE %changelog +* Sun May 22 2022 B. Stack - 30.0.0-1 +- update version + * Thu Jan 20 2022 B. Stack - 29.4.4-1 - update version -- cgit From 477bb1042ff42b7a8479fb00e65bd3f615ffc81c Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sun, 22 May 2022 13:10:12 -0400 Subject: nm: remove revert-mach-file from rpm --- newmoon/newmoon.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'newmoon/newmoon.spec') diff --git a/newmoon/newmoon.spec b/newmoon/newmoon.spec index f03a57b..d3ff2a7 100644 --- a/newmoon/newmoon.spec +++ b/newmoon/newmoon.spec @@ -63,7 +63,6 @@ Source7: nm-gcc-11.patch Patch0: small-icons.patch Patch1: pm-fedora.patch Patch2: pm-to-nm.patch -Patch3: revert-mach-file.patch %endif Packager: B. Stack @@ -125,7 +124,6 @@ sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 __gccver="$( gcc --version 2>&1 | grep -oE '[0-9]*\.[0-9]\.[0-9]'| head -n1 | grep -oE '^[0-9]+' )" if test "${__gccver}" == "11" ; then # For gcc 11 @@ -312,6 +310,7 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %changelog * Sun May 22 2022 B. Stack - 30.0.0-1 - update version +- remove revert-mach-file patch * Thu Jan 20 2022 B. Stack - 29.4.4-1 - update version -- cgit From 5390fe959b7062cb74497b680edbd10335bd028c Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sun, 22 May 2022 14:14:16 -0400 Subject: nm: re-add the submodule to rpm spec --- newmoon/newmoon.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'newmoon/newmoon.spec') diff --git a/newmoon/newmoon.spec b/newmoon/newmoon.spec index d3ff2a7..7e7311c 100644 --- a/newmoon/newmoon.spec +++ b/newmoon/newmoon.spec @@ -4,7 +4,7 @@ %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 RB_20220510 %global badname palemoon %global git_commit db5ee3c1968212742b4ed8b9883069ea7b03f0e1 %global tarballdir pale-moon @@ -52,7 +52,7 @@ License: MPLv2.0 URL: http://linux.palemoon.org/ 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 +Source1: https://repo.palemoon.org/MoonchildProductions/UXP/archive/%{submodule_platform_tag}.tar.gz Source2: newmoon-mozconfig Source3: newmoon.desktop Source4: newmoon-mimeinfo.xml @@ -114,7 +114,7 @@ and themes to make the browser truly your own. %prep %setup -q -n %{tarballdir} -#tar -C platform --strip-components=1 -zxf %%{SOURCE1} # git submodule +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 -- cgit From 8ae46801f52de9b9ef2a21b42246d3e3f4a87e97 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sun, 22 May 2022 14:19:51 -0400 Subject: fix typo --- newmoon/newmoon.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'newmoon/newmoon.spec') diff --git a/newmoon/newmoon.spec b/newmoon/newmoon.spec index 7e7311c..d356f29 100644 --- a/newmoon/newmoon.spec +++ b/newmoon/newmoon.spec @@ -114,7 +114,7 @@ and themes to make the browser truly your own. %prep %setup -q -n %{tarballdir} -tar -C platform --strip-components=1 -zxf %%{SOURCE1} # git submodule +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 -- cgit From 730a1f6e95568995c68c4bdd560c89d5ab7d5637 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sun, 22 May 2022 14:31:22 -0400 Subject: nm: remove nm-gcc-11 patch in spec --- newmoon/newmoon.spec | 8 -------- 1 file changed, 8 deletions(-) (limited to 'newmoon/newmoon.spec') diff --git a/newmoon/newmoon.spec b/newmoon/newmoon.spec index d356f29..f2e6d48 100644 --- a/newmoon/newmoon.spec +++ b/newmoon/newmoon.spec @@ -59,7 +59,6 @@ Source4: newmoon-mimeinfo.xml %if 0%{stackrpms_custom} Source5: bgstack15-newmoon-prefs.js Source6: bluemoon-icons.tgz -Source7: nm-gcc-11.patch Patch0: small-icons.patch Patch1: pm-fedora.patch Patch2: pm-to-nm.patch @@ -124,13 +123,6 @@ sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig %patch0 -p1 %patch1 -p1 %patch2 -p1 -__gccver="$( gcc --version 2>&1 | grep -oE '[0-9]*\.[0-9]\.[0-9]'| head -n1 | grep -oE '^[0-9]+' )" -if test "${__gccver}" == "11" ; then - # For gcc 11 - cd platform - patch -p1 < %{SOURCE7} - cd .. -fi ! test -d %{badname}/branding/unofficial.unbuilt && { cp -pr %{badname}/branding/unofficial %{badname}/branding/unofficial.unbuilt && \ -- cgit