summaryrefslogtreecommitdiff
path: root/newmoon/newmoon.spec
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2021-09-25 12:31:13 +0000
committerB. Stack <bgstack15@gmail.com>2021-09-25 12:31:13 +0000
commit2c0704ee49709f4813c4fb090db65532792af869 (patch)
tree71070a6f9f65bf1f8fc2a94553ddf083135bb2e7 /newmoon/newmoon.spec
parentMerge branch 'freefilesync-bump' into 'master' (diff)
parentfix %setup (diff)
downloadstackrpms-2c0704ee49709f4813c4fb090db65532792af869.tar.gz
stackrpms-2c0704ee49709f4813c4fb090db65532792af869.tar.bz2
stackrpms-2c0704ee49709f4813c4fb090db65532792af869.zip
Merge branch 'newmoon-bump' into 'master'
Newmoon bump See merge request bgstack15/stackrpms!264
Diffstat (limited to 'newmoon/newmoon.spec')
-rw-r--r--newmoon/newmoon.spec20
1 files changed, 13 insertions, 7 deletions
diff --git a/newmoon/newmoon.spec b/newmoon/newmoon.spec
index 5d22a22..fda941f 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 <bgstack15@gmail.com>
+Packager: B. Stack <bgstack15@gmail.com>
%if "%{?scl_env}" != ""
BuildRequires: %{scl_buildreq}
@@ -111,7 +113,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
@@ -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 <bgstack15@gmail.com> - 29.4.1-1
+- Use new intermediate git source because upstream
+ has stopped sharing git.
+
* Tue Aug 17 2021 B. Stack <bgstack15@gmail.com> - 29.4.0-1
- update version
bgstack15