summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2021-03-18 19:21:53 +0000
committerB. Stack <bgstack15@gmail.com>2021-03-18 19:21:53 +0000
commitf80de245b2c1faba2b63a55e6c74d317d68c054f (patch)
treec78cc4cb3e941c96b0f7cb875085051f053176ac
parentadd freefilesync alternative (diff)
downloadstackrpms-f80de245b2c1faba2b63a55e6c74d317d68c054f.tar.gz
stackrpms-f80de245b2c1faba2b63a55e6c74d317d68c054f.tar.bz2
stackrpms-f80de245b2c1faba2b63a55e6c74d317d68c054f.zip
Add newmoon rpm
Diffstat
-rw-r--r--newmoon/README.md12
-rw-r--r--newmoon/bgstack15-newmoon-prefs.js49
-rw-r--r--newmoon/bluemoon-icons.tgzbin0 -> 379306 bytes
-rw-r--r--newmoon/newmoon-mimeinfo.xml7
-rw-r--r--newmoon/newmoon-mozconfig45
-rw-r--r--newmoon/newmoon.desktop24
-rw-r--r--newmoon/newmoon.spec431
-rw-r--r--newmoon/pm-fedora.patch60
-rw-r--r--newmoon/pm-to-nm.patch383
-rw-r--r--newmoon/small-icons.patch22
-rw-r--r--ublock-origin-combined/ublock-origin-combined.spec17
11 files changed, 1039 insertions, 11 deletions
diff --git a/newmoon/README.md b/newmoon/README.md
index 500a3b1..5553a8b 100644
--- a/newmoon/README.md
+++ b/newmoon/README.md
@@ -2,15 +2,17 @@
https://github.com/MoonchildProductions/UXP/archive/PM28.7.2_Release.tar.gz
# Reason for being in stackrpms
-All my distros do not package Palemoon, so I package it myself. This at one point in 2018 was approved as a officially-endorsed third-party release of Palemoon but the package has since not been re-certified.
+All my distros do not package Palemoon, so I package it myself with some additions and brand customization.
# Alternatives
-Palemoon itself is a fork from Mozilla Firefox, which is still actively maintained and packaged by pretty much every distro. Waterfox is another fork of the original codebase, and is also packaged here in this repo.
+* Palemoon itself is a fork from Mozilla Firefox, which is still actively maintained and packaged by pretty much every distro.
+* Waterfox is another fork of the original codebase, and is also packaged here in this repo.
+* LibreWolf is a custom patchset maintained on top of Firefox.
# Reverse dependency matrix
-Distro | Palemoon version
+Distro | Newmoon version
---------- | ---------------
-All | 28.10.0
+All | 29.1.0
# Additional notes
Credit goes to so many sources and inspirations:
@@ -20,4 +22,4 @@ Credit goes to so many sources and inspirations:
* instructions for compiling on centos 6 and 7 http://developer.palemoon.org/Developer_Guide:Build_Instructions/Pale_Moon/Linux#head:CentOS_6
# Differences from upstream
-None
+diff -aur palemoon newmoon | vi -
diff --git a/newmoon/bgstack15-newmoon-prefs.js b/newmoon/bgstack15-newmoon-prefs.js
new file mode 100644
index 0000000..5848539
--- /dev/null
+++ b/newmoon/bgstack15-newmoon-prefs.js
@@ -0,0 +1,49 @@
+// file: /usr/lib/palemoon/browser/defaults/preferences/bgstack15-palemoon-prefs.js
+// deployed with palemoon-stackrpms package (rpm or dpkg) built by bgstack15
+// last modified 2020-04-15
+// reference:
+// https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig
+pref("browser.allTabs.previews", false);
+pref("browser.backspace_action", 0);
+pref("browser.ctrlTab.previews", false);
+pref("browser.ctrlTab.recentlyUsedOrder", false);
+pref("browser.download.useDownloadDir", true);
+pref("browser.newtab.choice", 1);
+pref("browser.newtabpage.storageVersion", 1);
+pref("browser.search.update", false);
+pref("browser.sessionstore.restore_on_demand", false);
+pref("browser.startup.page", 3);
+pref("browser.tabs.closeWindowWithLastTab", false);
+// These two have to stay undefined in Firefox 77+ in order for the drop-down for autocompletion to still work.
+//pref("browser.urlbar.disableExtendForTests", true);
+//pref("browser.urlbar.maxRichResults", 0);
+pref("browser.urlbar.trimURLs", false);
+pref("browser.urlbar.update1", false);
+pref("browser.xul.error_pages.enabled", false);
+pref("captivedetect.canonicalURL", "http://127.0.0.1:9980");
+pref("extensions.enabledAddons", "%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:28.3.0");
+pref("extensions.shownSelectionUI", true);
+pref("extensions.update.autoUpdateDefault", false);
+pref("general.warnOnAboutConfig", false);
+pref("network.automatic-ntlm-auth.trusted-uris", ".ipa.smith122.com");
+pref("network.cookie.prefsMigrated", true);
+pref("network.http.spdy.enabled", false);
+pref("network.negotiate-auth.trusted-uris", ".ipa.smith122.com");
+pref("network.stricttransportsecurity.preloadlist", false);
+pref("privacy.sanitize.migrateFx3Prefs", true);
+pref("security.cert_pinning.enforcement_level", 0);
+pref("services.sync.declinedEngines", "");
+pref("startup.homepage_override_url", "");
+pref("toolkit.telemetry.reportingpolicy.firstRun", false);
+pref("xpinstall.whitelist.add", "");
+// Control DNS over HTTPS (DoH) and Trusted Recursive Resolver (TRR).
+// More about DoH: https://github.com/bambenek/block-doh
+// https://blog.nightly.mozilla.org/2018/06/01/improving-dns-privacy-in-firefox/
+// https://support.mozilla.org/en-US/kb/configuring-networks-disable-dns-over-https
+// https://wiki.mozilla.org/Trusted_Recursive_Resolver
+// 0: Off by default, 1: Firefox chooses faster, 2: TRR default w/DNS fallback,
+// 3: TRR only mode, 4: Use DNS and shadow TRR for timings, 5: Disabled.
+pref("network.trr.mode", 0);
+pref("extensions.pocket.enabled", false);
+pref("extensions.pocket.api", "http://localhost:9980");
+pref("extensions.pocket.site", "http://localhost:9980");
diff --git a/newmoon/bluemoon-icons.tgz b/newmoon/bluemoon-icons.tgz
new file mode 100644
index 0000000..9449e66
--- /dev/null
+++ b/newmoon/bluemoon-icons.tgz
Binary files differ
diff --git a/newmoon/newmoon-mimeinfo.xml b/newmoon/newmoon-mimeinfo.xml
new file mode 100644
index 0000000..09f801d
--- /dev/null
+++ b/newmoon/newmoon-mimeinfo.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/x-xpinstall">
+ <comment xml:lang="en">Mozilla Cross-Platform Installer Module</comment>
+ <glob pattern="*.xpi" />
+ </mime-type>
+</mime-info>
diff --git a/newmoon/newmoon-mozconfig b/newmoon/newmoon-mozconfig
new file mode 100644
index 0000000..4578798
--- /dev/null
+++ b/newmoon/newmoon-mozconfig
@@ -0,0 +1,45 @@
+mk_add_options AUTOCLOBBER=1
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/pmbuild
+ac_add_options --enable-application=palemoon
+
+ac_add_options --enable-optimize="-O2 -Wl,--no-keep-memory -Wl,--reduce-memory-overhead"
+
+ac_add_options --enable-official-branding
+ac_add_options --enable-official-vendor
+
+# Safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
+# defines.sh during the beta cycle
+export BUILDING_RELEASE=1
+export MC_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+export MC_PALEMOON=1
+
+# Disable add-ons signing
+# Disable checking that add-ons are signed by the trusted root
+MOZ_ADDON_SIGNING=
+# Disable enforcing that add-ons are signed by the trusted root
+MOZ_REQUIRE_SIGNING=
+
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --enable-jemalloc
+ac_add_options --enable-av1
+#ac_add_options --enable-shared-js
+ac_add_options --enable-strip
+ac_add_options --with-pthreads
+ac_add_options --enable-phoenix-extensions
+
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+ac_add_options --disable-crashreporter
+ac_add_options --disable-eme
+ac_add_options --disable-parental-controls
+ac_add_options --disable-accessibility
+ac_add_options --disable-webrtc
+ac_add_options --disable-gamepad
+ac_add_options --disable-necko-wifi
+ac_add_options --disable-updater
+
+# Disable telemetry reporting
+export MOZ_TELEMETRY_REPORTING=
+
+ac_add_options --x-libraries=/usr/lib
diff --git a/newmoon/newmoon.desktop b/newmoon/newmoon.desktop
new file mode 100644
index 0000000..db57c23
--- /dev/null
+++ b/newmoon/newmoon.desktop
@@ -0,0 +1,24 @@
+[Desktop Entry]
+Name=Newmoon
+GenericName=Web Browser
+Comment=Browse the World Wide Web
+Keywords=Internet;WWW;Browser;Web;Explorer;
+Exec=@EXEC@ %u
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=newmoon
+Categories=Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
+StartupNotify=true
+Actions=NewWindow;NewPrivateWindow;
+
+[Desktop Action NewWindow]
+Name=Open new window
+Exec=@EXEC@ -new-window
+OnlyShowIn=Unity;
+
+[Desktop Action NewPrivateWindow]
+Name=New private window
+Exec=@EXEC@ -private-window
+OnlyShowIn=Unity;
diff --git a/newmoon/newmoon.spec b/newmoon/newmoon.spec
new file mode 100644
index 0000000..4e368a7
--- /dev/null
+++ b/newmoon/newmoon.spec
@@ -0,0 +1,431 @@
+%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_20210302
+%global badname palemoon
+
+# additional repos to get python27 and devtoolset-7
+# for el6 and el7: Software Collection;, for x86_64 only
+# http://mirror.centos.org/centos/6/sclo/x86_64/rh/
+# http://mirror.centos.org/centos/6/sclo/x86_64/sclo/
+# for el6.i386:
+# https://copr-be.cloud.fedoraproject.org/results/ewdurbin/pythons-el6/epel-6-$basearch/
+# https://copr-be.cloud.fedoraproject.org/results/mlampe/devtoolset-7/epel-6-$basearch/
+%define scl_env %{nil}
+%define scl_buildreq coreutils
+%if 0%{?el6}
+ %define scl_buildreq python27, devtoolset-7-toolchain
+ %ifarch x86_64
+ %define scl_env python27 devtoolset-7
+ %endif
+ %ifarch i386 || i686 || i586
+ %define scl_env devtoolset-7
+ %endif
+%endif
+%if 0%{?el7}
+ %define scl_env devtoolset-7
+ %define scl_buildreq devtoolset-7-toolchain
+%endif
+
+# suppress binary strippping on el6 which fails for some reason
+%if 0%{?el6}
+ %global __os_install_post %{nil}
+%endif
+
+%if 0%{stackrpms_custom}
+Name: newmoon
+%global prettyname Pale Moon
+%else
+Name: newmoon
+%endif
+Summary: Newmoon web browser
+Version: 29.1.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
+Source1: https://repo.palemoon.org/MoonchildProductions/UXP/archive/%{submodule_platform_tag}.tar.gz
+Source2: newmoon-mozconfig
+Source3: newmoon.desktop
+Source4: newmoon-mimeinfo.xml
+%if 0%{stackrpms_custom}
+Source5: bgstack15-newmoon-prefs.js
+Source6: bluemoon-icons.tgz
+Patch0: small-icons.patch
+Patch1: pm-fedora.patch
+Patch2: pm-to-nm.patch
+%endif
+Packager: Bgstack15 <bgstack15@gmail.com>
+
+%if "%{?scl_env}" != ""
+BuildRequires: %{scl_buildreq}
+%endif
+BuildRequires: alsa-lib-devel
+BuildRequires: autoconf213
+BuildRequires: bzip2-devel
+BuildRequires: dbus-glib-devel
+BuildRequires: desktop-file-utils
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: GConf2-devel
+BuildRequires: glib2-devel
+BuildRequires: gtk2-devel
+BuildRequires: libXt-devel
+BuildRequires: mesa-libGL-devel
+BuildRequires: notification-daemon
+BuildRequires: %{_libdir}/libssl.so
+BuildRequires: pkgconfig
+BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: pulseaudio-libs-devel
+BuildRequires: sqlite-devel
+BuildRequires: unzip
+BuildRequires: yasm
+BuildRequires: zip
+BuildRequires: zlib-devel
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires: python2-devel
+%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}
+Provides: mimehandler(application/x-xpinstall)
+Provides: newmoon
+Provides: webclient
+
+%description
+Newmoon offers you a browsing experience in a browser completely built
+from its own, independently developed source that has been forked off from
+Firefox/Mozilla code, with carefully selected features and optimizations to
+improve the browser's speed*, resource use, stability and user experience,
+while offering full customization and a growing collection of extensions
+and themes to make the browser truly your own.
+
+# To avoid the debug .build-id files that conflict with %%{badname}-stackrpms:
+%global _build_id_links none
+%global debug_package %{nil}
+%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
+%{__cp} %{SOURCE2} ./.mozconfig
+%if 0%{?fedora} >= 30
+sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig
+%endif
+
+%if 0%{stackrpms_custom}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+! test -d %{badname}/branding/unofficial.unbuilt && {
+ cp -pr %{badname}/branding/unofficial %{badname}/branding/unofficial.unbuilt && \
+ tar -C %{badname}/branding -zxf %{SOURCE6}
+} || :
+%endif
+
+%build
+%if "%{?scl_env}" != ""
+ thispwd=$( pwd )
+ scl enable %{scl_env} /bin/bash << EOF
+ pushd $thispwd
+%endif
+%if !%{dummy_package}
+ ./mach build
+%endif
+%if "%{?scl_env}" != ""
+ popd || :
+EOF
+%endif
+
+%install
+rm -rf %{buildroot}
+
+%if "%{?scl_env}" != ""
+ thispwd=$( pwd )
+ scl enable %{scl_env} /bin/bash << EOF
+ pushd $thispwd
+%endif
+%if !%{dummy_package}
+ make -f client.mk \
+ DESTDIR=%{buildroot} prefix=/usr \
+ idldir=%{_datadir}/idl/%{appname} \
+ includedir=%{_includedir}/%{appname} \
+ installdir=%{_libdir}/%{appname} \
+ sdkdir=%{_libdir}/%{appname}-devel \
+ install
+ rm -rf %{buildroot}%{_datadir}/idl \
+ %{buildroot}%{_libdir}/%{appname}-devel \
+ %{buildroot}%{_includedir} || :
+ rm -rf %{buildroot}%{_datarootdir}/idl # experiment from nm/d/rules
+ rm -rf %{buildroot}%{_libdir}/%{appname}-devel # experiment from nm/d/rules
+ rm -rf %{buildroot}%{_includedir} # experiment from nm/d/rules
+ # remove vestigial duplicate file
+ rm -rf %{buildroot}%{_libdir}/%{appname}/%{appname}-bin || :
+ mv %{buildroot}%{_libdir}/%{appname}/%{badname} %{buildroot}%{_libdir}/%{appname}/%{appname} || :
+ rm -rf %{buildroot}%{_libdir}/%{appname}/%{appname}-bin || :
+
+ mv %{buildroot}%{_bindir}/%{badname} %{buildroot}%{_bindir}/%{appname} || :
+ rm -rf %{buildroot}%{_bindir}/%{appname}
+ ln -sf %{_libdir}/%{appname}/%{appname} %{buildroot}%{_bindir}/%{appname}
+%endif
+%if "%{?scl_env}" != ""
+ popd || :
+EOF
+%endif
+
+# cleanup
+%{__rm} -rf %{buildroot}%{_datadir}/idl/%{appname} \
+ %{buildroot}%{_includedir}/%{appname} \
+ %{buildroot}%{_libdir}/%{appname}-devel
+
+# desktop files
+%{__mkdir_p} %{buildroot}%{_datadir}/applications
+desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE3}
+
+%{__sed} -i -r -e "s/@NAME@/%{prettyname}/;" \
+ -e "s/@EXEC@/%{appname}/;" \
+ -e "s/@ICON@/%{appname}/;" \
+ %{buildroot}%{_datadir}/applications/%{appname}.desktop
+
+# application start script
+# none
+
+# man pages
+# none
+
+# mimetypes
+%{__install} -Dm0644 %{SOURCE4} \
+ %{buildroot}%{_datadir}/mime/packages/%{name}.xml
+
+# icons
+%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps
+for s in 16 22 24 32 48 256 ;
+do
+ %{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps
+ %{__cp} -p %{badname}/branding/official/default${s}.png \
+ %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/%{appname}.png
+done
+
+# Register as an application to be visible in the software center
+# EXPERIMENTAL
+mkdir -p %{buildroot}%{_datadir}/appdata
+cat > %{buildroot}%{_datadir}/appdata/%{appname}.appdata.xml <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Adapted from content by Richard Hughes <richard-at-hughsie-dot-com> -->
+<application>
+ <id type="desktop">%{appname}.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <description>
+ <p>
+ Pale Moon offers you a browsing experience in a browser completely built from its own, independently developed source that has been forked off from Firefox/Mozilla code a number of years ago, with carefully selected features and optimizations to improve the browser stability and user experience, while offering full customization and a growing collection of extensions and themes to make the browser truly your own.
+ </p>
+ </description>
+ <url type="homepage">http://www.palemoon.org/</url>
+ <screenshots>
+ <screenshot type="default">http://www.palemoon.org/images/screenshots/Win10-start-portal.png</screenshot>
+ </screenshots>
+ <!-- FIXME: change this to an upstream email address for spec updates
+ <updatecontact>someone_who_cares@upstream_project.org</updatecontact>
+ -->
+</application>
+EOF
+
+# Add distribution.ini
+# skipped
+
+# filelist lifted straight from https://build.opensuse.org/package/view_file/network/palemoon/palemoon.spec?expand=1
+# get a list of files
+# $2 - dirlist
+# $3 - dir of fileslist
+# $4 - excludelist
+filelist() {
+ filelist=$PWD/$1
+ pushd %{buildroot}
+ find ./ | while read list; do
+ if [ -n "$4" ]; then
+ ! echo $list | grep "$4" || continue
+ fi
+ _file=$(echo $list | sed 's/[^/]//')
+ _dir=$(dirname $_file)
+ if echo $_dir | grep "$2"; then
+ grep -xqs "\%dir\ $_dir" $filelist || echo "%dir $_dir" >> $filelist
+ fi
+ if echo $_file | grep "$3"; then
+ [ -d "$list" ] || echo $_file >> $filelist
+ fi
+ done
+ popd
+}
+
+%if 0%{stackrpms_custom}
+%{__install} -d %{buildroot}%{_libdir}/%{name}/browser/defaults/preferences/
+%{__install} -Dm0644 %{SOURCE5} \
+ %{buildroot}%{_libdir}/%{name}/browser/defaults/preferences/
+%endif
+
+filelist file.lst %{appname} usr langpack
+
+%clean
+%{__rm} -rf %{buildroot} || :
+
+%post
+touch --no-create %{_datadir}/icons/hicolor 1>/dev/null 2>&1 || :
+
+%preun
+# is it a final removal?
+#if test "$1" = "0" ;
+#then
+#fi
+
+%postun
+if test "$1" = "0" ;
+then
+ touch --no-create %{_datadir}/icons/hicolor 1>/dev/null 2>&1 || :
+fi
+
+%posttrans
+update-desktop-database 1>/dev/null 2>&1 & :
+gtk-update-icon-cache %{_datadir}/icons/hicolor 1>/dev/null 2>&1 & :
+update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
+
+%files -f file.lst
+%defattr(-,root,root)
+%doc AUTHORS LICENSE
+
+%changelog
+* Tue Mar 16 2021 B. Stack <bgstack15@gmail.com> - 29.1.0-1
+- Fork rpm to newmoon
+- remove "stackrpms" suffix
+
+* Tue Mar 02 2021 B. Stack <bgstack15@gmail.com> - 29.1.0-1
+- update version
+
+* Mon Feb 15 2021 B. Stack <bgstack15@gmail.com> - 29.0.1-1
+- update version
+
+* Tue Feb 02 2021 B. Stack <bgstack15@gmail.com> - 29.0.0-1
+- update version
+
+* Fri Dec 18 2020 B. Stack <bgstack15@gmail.com> - 28.17.0-1
+- update version
+
+* Wed Nov 25 2020 B. Stack <bgstack15@gmail.com> - 28.16.0-1
+- update version
+
+* Tue Oct 27 2020 B. Stack <bgstack15@gmail.com> - 28.15.0-1
+- update version
+- change sources to upstream new location, repos.palemoon.org
+
+* Sat Oct 03 2020 B. Stack <bgstack15@gmail.com> - 28.14.2-1
+- update version
+
+* Fri Sep 25 2020 B. Stack <bgstack15@gmail.com> - 28.13.0-2
+- use valid RELBASE. Upstream probably unpublished RELBASE_20200831
+
+* Fri Sep 04 2020 B. Stack <bgstack15@gmail.com> - 28.13.0-1
+- update version
+
+* Wed Aug 05 2020 B. Stack <bgstack15@gmail.com> - 28.12.0-1
+- update version
+
+* Tue Jul 14 2020 B. Stack <bgstack15@gmail.com> - 28.11.0-1
+- update version
+
+* Fri Jun 05 2020 B. Stack <bgstack15@gmail.com> - 28.10.0-1
+- update version
+
+* Tue May 26 2020 B. Stack <bgstack15@gmail.com> - 28.9.3-2
+- add the aboutdialog customization
+
+* Fri May 08 2020 B. Stack <bgstack15@gmail.com> - 28.9.3-1
+- update version
+
+* Tue May 05 2020 B. Stack <bgstack15@gmail.com> - 28.9.2-2
+- Add customization to about dialog
+
+* Thu Apr 30 2020 B. Stack <bgstack15@gmail.com> - 28.9.2-1
+- update version
+
+* Fri Apr 10 2020 B. Stack <bgstack15@gmail.com> - 28.9.1-1
+- update version
+
+* Thu Mar 26 2020 B. Stack <bgstack15@gmail.com> - 28.9.0.2-1
+- update version
+- add git submodule support
+
+* Mon Mar 02 2020 B. Stack <bgstack15@gmail.com> - 28.8.4-1
+- update version
+
+* Tue Feb 18 2020 B. Stack <bgstack15@gmail.com> - 28.8.3-1
+- update version
+
+* Wed Feb 05 2020 B. Stack <bgstack15@gmail.com> - 28.8.2.1-1
+- update version
+- drop the vanilla release
+
+* Tue Jan 28 2020 B. Stack <bgstack15@gmail.com> - 28.8.2-1
+- update version
+
+* Mon Jan 13 2020 B. Stack <bgstack15@gmail.com> - 28.8.1-1
+- update version
+- place binary in /usr/bin instead of /usr/local/bin
+
+* Wed Dec 11 2019 B. Stack <bgstack15@gmail.com> - 28.8.0-1
+- update version
+- fc30 now also explicitly requires python2-devel. Fc31 already did.
+
+* Wed Oct 30 2019 B. Stack <bgstack15@gmail.com> - 28.7.2-1
+- update version
+- remove custom patch for mz1533969 because it was upstreamed
+- buildrequires use ssl lib name instead of package name to use either package
+
+* Thu Sep 12 2019 B. Stack <bgstack15@gmail.com> - 28.7.1-1
+- update version
+
+* Wed Sep 04 2019 B. Stack <bgstack15@gmail.com> - 28.7.0-1
+- update version
+
+* Thu Jul 25 2019 B. Stack <bgstack15@gmail.com> - 28.6.1-1
+- update version
+
+* Mon Jul 8 2019 B. Stack <bgstack15@gmail.com> - 28.6.0.1-2
+- remove custom patches for stock build
+
+* Fri Jul 5 2019 B. Stack <bgstack15@gmail.com> - 28.6.0.1-1
+- update version
+
+* Tue Jul 2 2019 B. Stack <bgstack15@gmail.com> - 28.6.0-1
+- update version
+- improve scriptlets for streamlining
+
+* Tue Jun 4 2019 B. Stack <bgstack15@gmail.com> - 28.5.2-1
+- update version
+
+* Tue Apr 30 2019 B. Stack <bgstack15@gmail.com> - 28.5.0-1
+- update version
+
+* Tue Feb 19 2019 B. Stack <bgstack15@gmail.com> 28.4.0-1
+- update version
+
+* Wed Jan 23 2019 B. Stack <bgstack15@gmail.com> 28.3.1-1
+- update version
+
+* Tue Jan 15 2019 B. Stack <bgstack15@gmail.com> 28.3.0-1
+- update version
+
+* Mon Dec 10 2018 B. Stack <bgstack15@gmail.com> 28.2.2-1
+- update version
+
+* Thu Sep 20 2018 B. Stack <bgstack15@gmail.com> 28.1.0-1
+- update version
+
+* Thu Sep 13 2018 B. Stack <bgstack15@gmail.com> 28.0.1-1
+- update version
+
+* Wed Sep 05 2018 B. Stack <bgstack15@gmail.com> 28.0.0-1
+- rpm spec updated
diff --git a/newmoon/pm-fedora.patch b/newmoon/pm-fedora.patch
new file mode 100644
index 0000000..494461b
--- /dev/null
+++ b/newmoon/pm-fedora.patch
@@ -0,0 +1,60 @@
+# pm-fedora.patch for newmoon
+diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/base/content/aboutDialog.xul Pale-Moon-28.9.0.2_Release-new/palemoon/base/content/aboutDialog.xul
+--- Pale-Moon-28.9.0.2_Release/palemoon/base/content/aboutDialog.xul 2020-03-25 09:49:13.000000000 -0400
++++ Pale-Moon-28.9.0.2_Release-new/palemoon/base/content/aboutDialog.xul 2020-05-05 09:12:48.776096853 -0400
+@@ -39,9 +39,9 @@
+ <vbox id="aboutHeaderBox" />
+ <vbox id="aboutVersionBox" flex="3">
+ #ifdef HAVE_64BIT_BUILD
+-#expand <label id="aboutVersion">Version: __MOZ_APP_VERSION__ (64-bit)</label>
++#expand <label id="aboutVersion">Version: __MOZ_APP_VERSION__ (64-bit) for Fedora/CentOS</label>
+ #else
+-#expand <label id="aboutVersion">Version: __MOZ_APP_VERSION__ (32-bit)</label>
++#expand <label id="aboutVersion">Version: __MOZ_APP_VERSION__ (32-bit) for Fedora/CentOS</label>
+ #endif
+ <label id="distribution" class="text-blurb"/>
+ <label id="distributionId" class="text-blurb"/>
+@@ -53,7 +53,7 @@
+ #ifdef MC_PRIVATE_BUILD
+ This is a private build of Pale Moon. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://www.palemoon.org/">Pale Moon website</label>.
+ #else
+- <label class="text-link" href="http://www.palemoon.org">Pale Moon</label> is released by <label class="text-link" href="http://www.moonchildproductions.info">Moonchild Productions</label>.
++ This build of newmoon is released by custom.
+ </description>
+ <description class="text-credits text-center">
+ Special thanks to all our supporters and donors for making this browser possible!
+diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/branding/official/content/aboutDialog.css Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/content/aboutDialog.css
+--- Pale-Moon-28.9.0.2_Release/palemoon/branding/official/content/aboutDialog.css 2020-03-25 09:49:13.000000000 -0400
++++ Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/content/aboutDialog.css 2020-05-05 09:02:38.318463672 -0400
+@@ -21,8 +21,6 @@
+ }
+
+ #aboutTextBox {
+- animation: 3s fadeIn;
+- animation-fill-mode: forwards;
+ text-shadow: 1px 1px 0px #9ABCD5;
+ color: #101020;
+ }
+diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.dtd Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.dtd
+--- Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.dtd 2020-03-25 09:49:13.000000000 -0400
++++ Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.dtd 2020-05-05 08:28:53.071897555 -0400
+@@ -1,4 +1,4 @@
+-<!ENTITY brandShortName "Pale Moon">
+-<!ENTITY brandFullName "Pale Moon">
+-<!ENTITY vendorShortName "Moonchild">
++<!ENTITY brandShortName "newmoon">
++<!ENTITY brandFullName "newmoon">
++<!ENTITY vendorShortName "custom">
+ <!ENTITY trademarkInfo.part1 "The Pale Moon logo and project names are trademarks of Moonchild Productions (M.C. Straver BASc). All rights reserved.">
+diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.properties Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.properties
+--- Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.properties 2020-03-25 09:49:13.000000000 -0400
++++ Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.properties 2020-05-05 08:28:07.923487413 -0400
+@@ -1,5 +1,5 @@
+-brandShortName=Pale Moon
+-brandFullName=Pale Moon
+-vendorShortName=Moonchild
++brandShortName=newmoon
++brandFullName=newmoon
++vendorShortName=custom
+
+ syncBrandShortName=Sync
diff --git a/newmoon/pm-to-nm.patch b/newmoon/pm-to-nm.patch
new file mode 100644
index 0000000..f667644
--- /dev/null
+++ b/newmoon/pm-to-nm.patch
@@ -0,0 +1,383 @@
+Date: 2020-10-01
+Upstream version: 28.15.0
+Purpose: Use newmoon branding instead of palemoon
+Message: Some of the changes include using ~/.config/newmoon for the profile location, using "newmoon" branding instead of "palemoon" or "browser", some bookmark tweaks to hide the old branding,
+I used newmoon itself to save a bookmark, and then export the bookmarks to an html file. Then I grabbed the relevant entries and placed them here. Also, I move the "Most Visited" link to bookmarks menu and not on the toolbar.
+
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/app/application.ini Pale-Moon-28.14.1_Release.new/palemoon/app/application.ini
+--- Pale-Moon-28.14.1_Release/palemoon/app/application.ini 2020-09-29 17:11:51.000000000 -0400
++++ Pale-Moon-28.14.1_Release.new/palemoon/app/application.ini 2020-10-01 17:14:07.439179218 -0400
+@@ -20,10 +20,10 @@
+
+ [App]
+ # Vendor=@MOZ_APP_VENDOR@
+-Vendor=Moonchild Productions
++Vendor=Config
+ # Name=@MOZ_APP_BASENAME@
+-Name=Pale Moon
+-RemotingName=@MOZ_APP_REMOTINGNAME@
++Name=newmoon
++RemotingName=newmoon
+ #ifdef MOZ_APP_DISPLAYNAME
+ CodeName=@MOZ_APP_DISPLAYNAME@
+ #endif
+@@ -47,4 +47,4 @@
+ [XRE]
+ #ifdef MOZ_PROFILE_MIGRATOR
+ EnableProfileMigrator=1
+-#endif
+\ No newline at end of file
++#endif
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/shared/locales/browserconfig.properties Pale-Moon-28.14.1_Release.new/palemoon/branding/shared/locales/browserconfig.properties
+--- pale-moon.orig/palemoon/branding/shared/locales/browserconfig.properties 2020-10-24 07:14:54.000000000 -0400
++++ pale-moon/palemoon/branding/shared/locales/browserconfig.properties 2020-10-27 20:35:29.301883148 -0400
+@@ -1,3 +1,3 @@
+ # Do NOT localize or otherwise change these values
+-browser.startup.homepage=http://start.palemoon.org/
+-browser.startup.homepage_reset=http://start.palemoon.org/
++browser.startup.homepage=http://start.duckduckgo.com/
++browser.startup.homepage_reset=http://start.duckduckgo.com/
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/shared/pref/preferences.inc Pale-Moon-28.14.1_Release.new/palemoon/branding/shared/pref/preferences.inc
+--- Pale-Moon-28.14.1_Release/palemoon/branding/shared/pref/preferences.inc 2020-09-29 17:11:51.000000000 -0400
++++ Pale-Moon-28.14.1_Release.new/palemoon/branding/shared/pref/preferences.inc 2020-10-01 17:14:16.203289213 -0400
+@@ -1,8 +1,8 @@
+ // ===| General |==============================================================
+
+-pref("startup.homepage_welcome_url","http://www.palemoon.org/firstrun.shtml");
++pref("startup.homepage_welcome_url","");
+
+-pref("app.vendorURL", "http://www.palemoon.org/");
++pref("app.vendorURL", "");
+
+
+ // User Interface
+@@ -24,7 +24,7 @@
+ // ===| Add-ons Manager |======================================================
+
+ // Add-on window fixes
+-pref("extensions.getMoreThemesURL", "https://addons.palemoon.org/themes/");
++pref("extensions.getMoreThemesURL", "");
+
+ pref("extensions.update.autoUpdateDefault", true); // Automatically update extensions by default
+ pref("extensions.getAddons.maxResults", 10);
+@@ -64,12 +64,12 @@
+ // ===| Sync |=================================================================
+
+ // Pale Moon Sync server URLs
+-pref("services.sync.serverURL","https://pmsync.palemoon.org/sync/index.php/");
+-pref("services.sync.jpake.serverURL","https://keyserver.palemoon.org/");
+-pref("services.sync.termsURL", "http://www.palemoon.org/sync/terms.shtml");
+-pref("services.sync.privacyURL", "http://www.palemoon.org/sync/privacy.shtml");
+-pref("services.sync.statusURL", "https://pmsync.palemoon.org/status/");
+-pref("services.sync.syncKeyHelpURL", "http://www.palemoon.org/sync/help/recoverykey.shtml");
++pref("services.sync.serverURL","https://localhost:9999/sync/index.php/");
++pref("services.sync.jpake.serverURL","https://localhost:9999/");
++pref("services.sync.termsURL", "http://localhost:9999/sync/terms.shtml");
++pref("services.sync.privacyURL", "http://localhost:9999/sync/privacy.shtml");
++pref("services.sync.statusURL", "https://localhost:9999/status/");
++pref("services.sync.syncKeyHelpURL", "http://localhost:9999/sync/help/recoverykey.shtml");
+
+ pref("services.sync.APILevel", 1); // FSyncMS doesn't support 'info/configuration' requests
+
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/branding.nsi Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/branding.nsi
+--- Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/branding.nsi 2020-09-29 17:11:51.000000000 -0400
++++ Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/branding.nsi 2020-10-01 17:17:03.761408034 -0400
+@@ -8,8 +8,8 @@
+
+ # BrandFullNameInternal is used for some registry and file system values
+ # instead of BrandFullName and typically should not be modified.
+-!define BrandFullNameInternal "Browser"
+-!define CompanyName "somebody"
++!define BrandFullNameInternal "newmoon"
++!define CompanyName "custom"
+ !define URLInfoAbout " "
+ !define URLUpdateInfo " "
+ !define HelpLink " "
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/browser.desktop Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/browser.desktop
+--- Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/browser.desktop 2020-09-29 17:11:51.000000000 -0400
++++ Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/browser.desktop 2020-10-01 17:15:25.608161879 -0400
+@@ -2,24 +2,24 @@
+ Name=Browser
+ GenericName=Web Browser
+ Comment=Browse the World Wide Web
+-Exec=palemoon %u
++Exec=newmoon %u
+ Terminal=false
+ Type=Application
+-Icon=palemoon
++Icon=newmoon
+ Categories=Network;WebBrowser;
+ MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
+ StartupNotify=false
+ Actions=NewTab;NewWindow;NewPrivateWindow;
+-StartupWMClass="browser"
++StartupWMClass="newmoon"
+
+ [Desktop Action NewTab]
+ Name=Open new tab
+-Exec=palemoon -new-tab
++Exec=newmoon -new-tab
+
+ [Desktop Action NewWindow]
+ Name=Open new window
+-Exec=palemoon -new-window
++Exec=newmoon -new-window
+
+ [Desktop Action NewPrivateWindow]
+ Name=New private window
+-Exec=palemoon -private-window
++Exec=newmoon -private-window
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/configure.sh Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/configure.sh
+--- Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/configure.sh 2020-09-29 17:11:51.000000000 -0400
++++ Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/configure.sh 2020-10-01 17:17:33.697789678 -0400
+@@ -2,4 +2,4 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+-MOZ_APP_DISPLAYNAME="Browser"
++MOZ_APP_DISPLAYNAME="newmoon"
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/locales/en-US/brand.dtd Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/locales/en-US/brand.dtd
+--- Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/locales/en-US/brand.dtd 2020-09-29 17:11:51.000000000 -0400
++++ Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/locales/en-US/brand.dtd 2020-10-01 17:17:26.793700936 -0400
+@@ -2,7 +2,7 @@
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+-<!ENTITY brandShortName "Browser">
+-<!ENTITY brandFullName "Browser">
+-<!ENTITY vendorShortName "somebody">
++<!ENTITY brandShortName "newmoon">
++<!ENTITY brandFullName "newmoon">
++<!ENTITY vendorShortName "custom">
+ <!ENTITY trademarkInfo.part1 " ">
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/locales/en-US/brand.properties Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/locales/en-US/brand.properties
+--- Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/locales/en-US/brand.properties 2020-09-29 17:11:51.000000000 -0400
++++ Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/locales/en-US/brand.properties 2020-10-01 17:17:15.509557191 -0400
+@@ -2,8 +2,8 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+-brandShortName=Browser
+-brandFullName=Browser
+-vendorShortName=somebody
++brandShortName=newmoon
++brandFullName=newmoon
++vendorShortName=custom
+
+ syncBrandShortName=Sync
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/pref/palemoon-branding.js Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/pref/palemoon-branding.js
+--- pale-moon.orig/palemoon/branding/unofficial/pref/palemoon-branding.js 2020-10-24 07:14:54.000000000 -0400
++++ pale-moon/palemoon/branding/unofficial/pref/palemoon-branding.js 2020-10-27 21:06:40.837761688 -0400
+@@ -18,18 +18,18 @@
+ pref("image.mem.max_ms_before_yield", 50);
+ pref("image.mem.decode_bytes_at_a_time", 65536);
+
+-pref("services.sync.serverURL","https://pmsync.palemoon.org/sync/index.php/");
+-pref("services.sync.jpake.serverURL","https://keyserver.palemoon.org/");
+-pref("services.sync.termsURL", "http://www.palemoon.org/sync/terms.shtml");
+-pref("services.sync.privacyURL", "http://www.palemoon.org/sync/privacy.shtml");
+-pref("services.sync.statusURL", "https://pmsync.palemoon.org/status/");
+-pref("services.sync.syncKeyHelpURL", "http://www.palemoon.org/sync/help/recoverykey.shtml");
++pref("services.sync.serverURL","https://example.com/sync/index.php/");
++pref("services.sync.jpake.serverURL","https://example.com/");
++pref("services.sync.termsURL", "https://example.com/sync/terms.shtml");
++pref("services.sync.privacyURL", "https://example.com/sync/privacy.shtml");
++pref("services.sync.statusURL", "https://example.com/status/");
++pref("services.sync.syncKeyHelpURL", "https://example.com/sync/help/recoverykey.shtml");
+ pref("services.sync.APILevel", 1);
+
+ pref("accessibility.force_disabled", 1);
+ pref("devtools.selfxss.count", 5);
+-pref("startup.homepage_welcome_url","http://www.palemoon.org/unofficial.shtml");
+-pref("startup.homepage_override_url","http://www.palemoon.org/unofficial.shtml");
+-pref("app.releaseNotesURL", "http://www.palemoon.org/releasenotes.shtml");
++pref("startup.homepage_welcome_url","http://start.duckduckgo.com/unofficial.shtml");
++pref("startup.homepage_override_url","http://start.duckduckgo.com/unofficial.shtml");
++pref("app.releaseNotesURL", "");
+ pref("app.update.enabled", false);
+ pref("app.update.url", "");
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/components/nsBrowserGlue.js Pale-Moon-28.14.1_Release.new/palemoon/components/nsBrowserGlue.js
+--- Pale-Moon-28.14.1_Release/palemoon/components/nsBrowserGlue.js 2020-09-29 17:11:51.000000000 -0400
++++ Pale-Moon-28.14.1_Release.new/palemoon/components/nsBrowserGlue.js 2020-10-01 17:14:16.203289213 -0400
+@@ -1695,8 +1695,8 @@
+ uri: NetUtil.newURI("place:sort=" +
+ Ci.nsINavHistoryQueryOptions.SORT_BY_VISITCOUNT_DESCENDING +
+ "&maxResults=" + MAX_RESULTS),
+- parent: PlacesUtils.toolbarFolderId,
+- position: toolbarIndex++,
++ parent: PlacesUtils.bookmarksMenuFolderId,
++ position: menuIndex++,
+ newInVersion: 1
+ },
+ RecentlyBookmarked: {
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/palemoon.dtd Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/palemoon.dtd
+--- Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/palemoon.dtd 2020-09-29 17:11:51.000000000 -0400
++++ Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/palemoon.dtd 2020-10-01 17:14:16.199289163 -0400
+@@ -3,13 +3,11 @@
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+ <!ENTITY chronicles.title.66.1
+-'The Chronicles of the Pale Moon, 66:1'>
++'newmoon'>
+
+ <!ENTITY chronicles.quote.66.1
+-'The <em>landscape changed</em> as time went on: flowing, twisting, corrupting. The dull sheen of <em>tainted metal</em> shining through everywhere.<br/>
+-In the trees, roots, animals, and even the <em>mountainous valleys</em> that had always been an <em>oasis of difference</em>.<br/>
+-Still, our dragon continued, untainted and resolute, soaring above.<br/>
+-There would be a home yet, <em>a sanctuary</em>, a place for all those not given in to this <em>singular</em> invading force that was <em>misshaping</em> the world.'>
++'custom build<br/>'
++>
+
+ <!ENTITY chronicles.from.66.1
+-'from <strong>The Chronicles of the Pale Moon,</strong> 66:1'>
++'custom build'>
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/preferences/tabs.dtd Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/preferences/tabs.dtd
+--- Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/preferences/tabs.dtd 2020-09-29 17:11:51.000000000 -0400
++++ Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/preferences/tabs.dtd 2020-10-01 17:14:16.199289163 -0400
+@@ -31,6 +31,6 @@
+ <!ENTITY newtabPage.label "When opening a new tab, show:">
+ <!ENTITY newtabPage.custom.label "A custom URL">
+ <!ENTITY newtabPage.blank.label "A blank page">
+-<!ENTITY newtabPage.home.label "The Pale Moon start page">
++<!ENTITY newtabPage.home.label "The newmoon start page">
+ <!ENTITY newtabPage.myhome.label "My home page">
+ <!ENTITY newtabPage.quickdial.label "The Quickdial page">
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd
+--- Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd 2020-09-29 17:11:51.000000000 -0400
++++ Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd 2020-10-01 17:14:16.199289163 -0400
+@@ -5,6 +5,6 @@
+ <!ENTITY status4evar.throbber.widget.title "Activity Indicator">
+ <!ENTITY status4evar.download.widget.title "Download Status">
+ <!ENTITY status4evar.options.widget.title "Status Bar Preferences">
+-<!ENTITY status4evar.options.widget.label "Pale Moon status bar">
++<!ENTITY status4evar.options.widget.label "newmoon status bar">
+ <!ENTITY status4evar.menu.options.label "Status Bar Preferences">
+
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd
+--- Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd 2020-09-29 17:11:51.000000000 -0400
++++ Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd 2020-10-01 17:14:16.199289163 -0400
+@@ -1,4 +1,4 @@
+-<!ENTITY status4evar.window.title "Pale Moon status bar preferences">
++<!ENTITY status4evar.window.title "newmoon status bar preferences">
+
+ <!ENTITY status4evar.pane.status "Status">
+ <!ENTITY status4evar.pane.progress "Progress">
+@@ -33,7 +33,7 @@
+ <!ENTITY status4evar.option.no-repeat "No Repeat">
+ <!ENTITY status4evar.option.space "Space">
+ <!ENTITY status4evar.option.round "Round">
+-<!ENTITY status4evar.option.firefoxdefault "Pale Moon default">
++<!ENTITY status4evar.option.firefoxdefault "newmoon default">
+ <!ENTITY status4evar.option.download.library "Library">
+ <!ENTITY status4evar.option.download.tab "Tab">
+ <!ENTITY status4evar.option.download.thirdparty "3rd Party">
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/syncBrand.dtd Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/syncBrand.dtd
+--- Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/syncBrand.dtd 2020-09-29 17:11:51.000000000 -0400
++++ Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/syncBrand.dtd 2020-10-01 17:14:16.199289163 -0400
+@@ -3,4 +3,4 @@
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+ <!ENTITY syncBrand.shortName.label "Sync">
+-<!ENTITY syncBrand.fullName.label "Pale Moon Sync">
++<!ENTITY syncBrand.fullName.label "newmoon Sync">
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/syncSetup.properties Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/syncSetup.properties
+--- Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/syncSetup.properties 2020-09-29 17:11:51.000000000 -0400
++++ Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/syncSetup.properties 2020-10-01 17:14:16.199289163 -0400
+@@ -38,7 +38,7 @@
+ addonsCount.label = #1 addon;#1 addons
+
+ save.recoverykey.title = Save Recovery Key
+-save.recoverykey.defaultfilename = Pale Moon Recovery Key.html
++save.recoverykey.defaultfilename = newmoon Recovery Key.html
+
+ newAccount.action.label = Sync is now set up to automatically sync all of your browser data.
+ newAccount.change.label = You can choose exactly what to sync by selecting Sync Options below.
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/overrides/appstrings.properties Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/overrides/appstrings.properties
+--- Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/overrides/appstrings.properties 2020-09-29 17:11:51.000000000 -0400
++++ Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/overrides/appstrings.properties 2020-10-01 17:14:16.199289163 -0400
+@@ -3,24 +3,24 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+ malformedURI=The URL is not valid and cannot be loaded.
+-fileNotFound=Pale Moon can't find the file at %S.
+-dnsNotFound=Pale Moon can't find the server at %S.
+-unknownProtocolFound=Pale Moon doesn't know how to open this address, because the protocol (%S) isn't associated with any program.
+-connectionFailure=Pale Moon can't establish a connection to the server at %S.
++fileNotFound=newmoon can't find the file at %S.
++dnsNotFound=newmoon can't find the server at %S.
++unknownProtocolFound=newmoon doesn't know how to open this address, because the protocol (%S) isn't associated with any program.
++connectionFailure=newmoon can't establish a connection to the server at %S.
+ netInterrupt=The connection to %S was interrupted while the page was loading.
+ netTimeout=The server at %S is taking too long to respond.
+-redirectLoop=Pale Moon has detected that the server is redirecting the request for this address in a way that will never complete.
++redirectLoop=newmoon has detected that the server is redirecting the request for this address in a way that will never complete.
+ ## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S"
+ confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier.
+ resendButton.label=Resend
+-unknownSocketType=Pale Moon doesn't know how to communicate with the server.
++unknownSocketType=newmoon doesn't know how to communicate with the server.
+ netReset=The connection to the server was reset while the page was loading.
+ notCached=This document is no longer available.
+-netOffline=Pale Moon is currently in offline mode and can't browse the Web.
++netOffline=newmoon is currently in offline mode and can't browse the Web.
+ isprinting=The document cannot change while Printing or in Print Preview.
+-deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Pale Moon has canceled the request for your protection.
+-proxyResolveFailure=Pale Moon is configured to use a proxy server that can't be found.
+-proxyConnectFailure=Pale Moon is configured to use a proxy server that is refusing connections.
++deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. newmoon has canceled the request for your protection.
++proxyResolveFailure=newmoon is configured to use a proxy server that can't be found.
++proxyConnectFailure=newmoon is configured to use a proxy server that is refusing connections.
+ contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
+ unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem.
+ externalProtocolTitle=External Protocol Request
+@@ -32,6 +32,6 @@
+ cspBlocked=This page has a content security policy that prevents it from being embedded in this way.
+ xssBlockMode=This page contains an XSS attack that has been blocked for your security.
+ corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected.
+-remoteXUL=This page uses an unsupported technology that is no longer available by default in Pale Moon.
++remoteXUL=This page uses an unsupported technology that is no longer available by default in newmoon.
+ ## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S".
+-sslv3Used=Pale Moon cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
++sslv3Used=newmoon cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/searchplugins/duckduckgo-palemoon.xml Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/searchplugins/duckduckgo-palemoon.xml
+--- Pale-Moon-28.14.1_Release/palemoon/locales/en-US/searchplugins/duckduckgo-palemoon.xml 2020-09-29 17:11:51.000000000 -0400
++++ Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/searchplugins/duckduckgo-palemoon.xml 2020-10-01 17:14:16.199289163 -0400
+@@ -6,7 +6,7 @@
+ <LongName>Search Plugin for DuckDuckGo (HTTPS version)</LongName>
+ <Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAEAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA11RgALs6oACbQ9wAj0v8AI9L/ACfQ9wAu0agANdUYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzzN4CNdL/oK/z//////////////////////+jsPv/BDXX/wAz0t4AAAAAAAAAAAAAAAAAAAAAAAAAAAAyzvNSduD//////8jK/v+P+Lf/IbQL/17RPP+J3Y//wOKX//////9YeuX/ADLO8wAAAAAAAAAAAAAAAAAw091piOX/8/X9/1Fx5P9xhu//WOWZ/0W9Lv9Lwjn/J8BB/xyDAP9bdfL/9fP//2mI5v8AMNPdAAAAAAc610YRQ9f//////0Zr4P8AGdD/sb32////////////wrv//wAh1/8MPab/ACPc/05r4///////EkPX/wc610YANtWkrr/y/6S48P8AJ9L/AB3R/+/w/v///////////3+D7f8AQeL/AYTw/wFr5/8AMNb/p7Tv/6698v8AM9WkADLW//////8yXt//AC3V/wAw1/////////////z///8A0P7/AKb1/wWI7P8AuPf/AJ3w/zZW3P//////ADHV/wAx2P//////AzrZ/wAu1/84ZOL////////////e////AND//wC1+f8Atff/AZbv/wY62f8ELNf//////wAw1/8AMtn//////wAw2f8ALNn/kKrz////+//cwbH////////////R////Rcb8/wDO/f8A/P//AHzo//////8AMNj/ADXa//////8vXuL/ACna/4yq9///79T/jUkg/9i+r///////r2Q0/7Cozv8BKdr/AirY/zdZ4P//////ADTa/wI72tOuv/T/prr0/wAl2v+JqPb//7yW/+bUxv/9+/n////u//W+n/+Op/L/ADPd/wAv2v+ru/T/r7/0/wI72tMLQd1DEEjg//////9Cbef/ADng///////////////////////R3///AC3g/wAy3v9SeOn//////xFI4P8LQd1DAAAAAAM64PNmiuz/9/j//2mN7f/m7P3///////////9Cb+n/ACXd/wAt3v9rju3//////2iL7P8DOuDzAAAAAAAAAAAAAAAAAT3g/0p16f//////3OT8/3OS7v8AKt3/ACPc/zhn5/+xw/b//////0956v8CPeD/AAAAAAAAAAAAAAAAAAAAAAAAAAAEPODzBUDh/5uz8//7/f7/////////////////prz0/wtF4v8FQeDzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtF5kYDQOOkADrj/wA44v8AOeP/ADzk/wVB46QPReZGAAAAAAAAAAAAAAAAAAAAAPAPAADgBwAAwAMAAIABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAADAAwAA4AcAAPAPAAAoAAAAIAAAAEAAAAABACAAAAAAAAAQAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChIzyAnRNFwJ0TQryND0d8nRNH/J0TR/ydE0f8nRNH/I0PR3ydE0K8nRNFwKEjPIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChE00AlRdK/J0XS/ydF0v8nRdL/XXPd/11z3f94i+P/k6Lp/5Oi6f9rf+D/NVDV/ydF0v8nRdL/JUXSvyhE00AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAzxAnRNOvJ0XT/ydF0/8lRdK/KEXSYOvu+6/+/v6//v7+v/39/c////////////7+/r/J0fOAKEXSYCVF0r8nRdP/J0XT/ydE068gQM8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlRdUwJ0bT7ydG0/8nRtHPKETTQAAAAADHx8dA2vHhn5TYpN/o9+z/////////////////8PL83ydG0o8lRdUwAAAAAChE00AnRtHPJ0bT/ydG0+8lRdUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKEXVYCdG1P8nRtT/KEbTgAAAAAAmRtZQI0PU38jIyP/F6s//Rrtk/0a7ZP9/yIr/c796/4vLkv+JpNf/M3Kq/zyWh/8zeKTfJkbWUAAAAAAoRtOAJ0bU/ydG1P8oRdVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVF1TAnR9X/J0fV/yhF1WAgQM8QJ0fTrydH1f9CW8//2tra/6Pdsv9Gu2T/Rrtk/0WzWv9Gu2T/Rrtk/0a7ZP9Gu2T/Rrtk/z6egP8nR9X/J0fTryBAzxAoRdVgJ0fV/ydH1f8lRdUwAAAAAAAAAAAAAAAAAAAAAAAAAAAgQM8QJ0fV7ydH1f8oSNVgIEDPECdH1c8nR9X/J0fV/1xwyf/t7e3/o92y/0a7ZP9Gu2T/Ra5U/0a7ZP9Gu2T/Rrtk/0a7ZP9Gu2T/Pp6A/ydH1f8nR9X/J0fVzyBAzxAoSNVgJ0fV/ydH1e8gQM8QAAAAAAAAAAAAAAAAAAAAACdH1q8nR9b/KEjVgCBQzxAnR9bPJ0fW/ydH1v8nR9b/gIzB//r6+v+j3bL/Rrtk/13Ed/+i26//ruG7/z6egf8+noH/Rrtk/0a7ZP86kI//J0fW/ydH1v8nR9b/J0fWzyBQzxAoSNWAJ0fW/ydH1q8AAAAAAAAAAAAAAAAoSNdAJkjW/yZH1s8AAAAAJEfWryZI1v8mSNb/JkjW/yZI1v+jqsT//////+j37P/R7tj////////////W3ff/JkjW/yZI1v8uZbr/PJeI/zJzrP8mSNb/JkjW/yZI1v8mSNb/JEfWrwAAAAAmR9bPJkjW/yhI10AAAAAAAAAAACVI1r8mSNf/KEjXQCZJ1lAmSNf/JkjX/yZI1/8mSNf/JkjX/9HR0f///////////////////////////5Ok6/8mSNf/JkjX/yZI1/8mSNf/JkjX/yZI1/8mSNf/JkjX/yZI1/8mSNf/JknWUChI10AmSNf/JUjWvwAAAAAoSNcgJknY/yZH2M8AAAAAI0nY3yZJ2P8mSdj/JknY/yZJ2P9KZM//39/f////////////////////////////XHfi/yZJ2P8mSdj/JknY/yZJ2P8mSdj/JknY/yZJ2P8mSdj/JknY/yZJ2P8jSdjfAAAAACZH2M8mSdj/KEjXICdJ2HAmSdj/JUjXYCVK2jAmSdj/JknY/yZJ2P8mSdj/JknY/2V4yf/t7e3///////////////////////////9cd+L/HXTj/xSf7/8Nwfj/CdL8/wnS/P8J0vz/ELDz/xt85v8mSdj/JknY/yZJ2P8lStowJUjXYCZJ2P8nSdhwJErZryZK2f8oSNcgJUnajyZK2f8mStn/JkrZ/yZK2f8mStn/iJPA////////////////////////////0ff+/xjV/P8J0vz/Drn1/xiO6/8Yjuv/GI7r/xCw8/8Lyvr/CdL8/xmF6P8mStn/JkrZ/yVJ2o8oSNcgJkrZ/yRK2a8jStrfI0rZ3wAAAAAlSdq/Jkra/yZK2v8mStr/Jkra/yZK2v+xtsf///////////////////////////8o2Pz/CdL8/wvK+v8mStr/Jkra/yZK2v8mStr/Jkra/yZK2v8iW97/Jkra/yZK2v8mStr/JUnavwAAAAAjStnfI0ra3yZK2v8lSdq/AAAAACZH2O8mStr/Jkra/yZK2v8mStr/L1HY/9HR0f///////////////////////////yjY/P8J0vz/CdL8/xCw9P8QsPT/ELD0/xSf7/8ddeX/Jkra/yZK2v8mStr/Jkra/yZK2v8mR9jvAAAAACVJ2r8mStr/Jkvb/yVJ2r8AAAAAJkvb/yZL2/8mS9v/Jkvb/yZL2/9KZtL/4+Pj////////////////////////////4Pn//0fd/f8J0vz/CdL8/wnS/P8J0vz/CdL8/wnS/P8Lyvr/Fpfu/yJc3/8mS9v/Jkvb/yZL2/8AAAAAJUnavyZL2/8mS9z/JUncvwAAAAAmS9z/Jkvc/yZL3P8mS9z/Jkvc/26AyP/x8fH//////////////////////////////////////9H3/v/C9P7/o+7+/2fa+/8Oufb/CdL8/wnS/P8J0vz/CdL8/xiP7P8mS9z/Jkvc/wAAAAAlSdy/Jkvc/yZM3P8lTNy/AAAAACZJ2e8mTNz/Jkzc/yZM3P8mTNz/iJTB////////////qnth/5VaOf/x6eX///////////////////////Hp5f/x6eX/ydL2/yZM3P8kVN7/G37o/xKo8v8QsfT/HXbm/yZM3P8mSdnvAAAAACVM3L8mTNz/I0vc3yZJ2u8AAAAAJUzevyZM3f8mTN3/Jkzd/yZM3f+fqc3///////////+VWjn/v5yI/+re1///////////////////////jk8s/7iRe//J0vb/Jkzd/yZM3f8mTN3/Jkzd/yZM3f8mTN3/Jkzd/yVM3r8AAAAAI0vc3yNL3N8kTd2vJk3d/yhQ3yAlTd2PJk3d/yZN3f8mTd3/Jk3d/6St0v////////////Hp5f/q3tf///////////////////////////+xhm7/49PK/6Cx8P8mTd3/Jk3d/yZN3f8mTd3/Jk3d/yZN3f8mTd3/JU3djyhQ3yAmTd3/JE3drydN33AmTd7/J03fcCVK3zAmTd7/Jk3e/yZN3v8mTd7/pK7S///////Sp5r/////////////////////////////////////////////////T27k/yZN3v8mTd7/Jk3e/yZN3v8mTd7/Jk3e/yZN3v8lSt8wJ03fcCZN3v8nTd9wKFDfICZO3/8mTt3PAAAAACVN3r8mTt//Jk7f/yZO3/+EltX//////+fRyv/SqaD/59LO///////////////////////at63/vIBy/7Glxf8mTt//Jk7f/yZO3/8mTt//Jk7f/yZO3/8mTt//JU3evwAAAAAmTt3PJk7f/yhQ3yAAAAAAJE/dryZO3/8oUN9AKFDfQCZO3/8mTt//Jk7f/zhb2v/o6/T/////////////////////////////////////////////////XHrn/yZO3/8mTt//Jk7f/yZO3/8mTt//Jk7f/yZO3/8oUN9AKFDfQCZO3/8kT92vAAAAAAAAAAAoUN9AJk7g/yZO4M8AAAAAJk/hnyZO4P8mTuD/Jk7g/05v5v/k6fv//////////////////////////////////////3eR7P8mTuD/Jk7g/yZO4P8mTuD/Jk7g/yZO4P8mTuD/Jk/hnwAAAAAmTuDPJk7g/yhQ30AAAAAAAAAAAAAAAAAjT+GfJU/h/yVO4Y8gUN8QIk7gzyVP4f8lT+H/SWnW/0lp1v+bq+H/8fHx/////////////////6Cy8v9OcOb/JU/h/yVP4f8lT+H/JU/h/yVP4f8lT+H/JU/h/yJO4M8gUN8QJU7hjyVP4f8jT+GfAAAAAAAAAAAAAAAAAAAAACBQ3xAlTOHvJU/h/yVQ4mAgUN8QIk7hzyVP4f+ktOv///////////////////////H0/f9phur/JU/h/yVP4f8lT+H/JU/h/yVP4f8lT+H/JU/h/yVP4f8iTuHPIFDfECVQ4mAlT+H/JUzh7yBQ3xAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ3zAlUOLvJVDi/yVQ4mAgUN8QI1Din4mb2//J0/j/ydP4/6299P93ku3/M1vk/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/I1DinyBQ3xAlUOJgJVDi/yVQ4u8lUN8wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ5DAlUOLvJVDi/yVQ4o8AAAAAJFDjQCVQ4r8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDivyRQ40AAAAAAJVDijyVQ4v8lUOLvJVDkMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ5DAjUeTfJVHj/yNR5N8kUONAAAAAACVQ5DAmUuOAJVHivyNR5N8lUeP/JVHj/yNR5N8lUeK/JlLjgCVQ5DAAAAAAJFDjQCNR5N8lUeP/I1Hk3yVQ5DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBQ3xAjUuSfJVHk/yVR5P8jUeTfJFLkcChQ5yAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoUOcgJFLkcCNR5N8lUeT/JVHk/yNS5J8gUN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkUONAI1LknyVS5P8lUuT/JVLk/yVS5O8lUeS/JVHkvyVR5L8lUeS/JVLk7yVS5P8lUuT/JVLk/yRS468kUONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIFDfECVS5GAjUuWfIlPlzyVS5f8lUuX/JVLl/yVS5f8iU+XPI1LlnyVS5GAgUN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/AA///AAD//AAAP/ggBB/wgAEP4AAAB8AAAAPAAAADiAAAEYAAAAEQAAAIAAAAAAAAAAAgAAAEIAAABCAAAAQgAAAEIAAABCAAAAQAAAAAAAAAABAAAAiAAAABiAAAEcAAAAPAAAAD4AAAB/CAAQ/4IAQf/AfgP/8AAP//wAP/</Image>
+ <Url type="text/html" method="get" template="https://duckduckgo.com/">
+- <Param name="t" value="palemoon"/>
++ <Param name="t" value="newmoon"/>
+ <Param name="q" value="{searchTerms}"/>
+ </Url>
+ <Url type="application/x-suggestions+json" method="GET" template="https://duckduckgo.com/ac/">
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/searchplugins/ekoru.xml Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/searchplugins/ekoru.xml
+--- Pale-Moon-28.14.1_Release/palemoon/locales/en-US/searchplugins/ekoru.xml 2020-09-29 17:11:51.000000000 -0400
++++ Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/searchplugins/ekoru.xml 2020-10-01 17:14:16.199289163 -0400
+@@ -5,6 +5,6 @@
+ <InputEncoding>UTF-8</InputEncoding>
+ <LongName>Ekoru Search</LongName>
+ <Image height="16" width="16" type="image/x-icon">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAABMLAAATCwAAAAAAAAAAAAAAAAAAxKIkAKyyPgLUmhFN2JkKwtKfEObJoxrvyaQb8NCgEenTmQvTzJQRe8CUHg/FlBYAkpLMAAAAAAAAAAAAxaEoABa5/wDUng9Z1aAJ562pI/96skP+Y7RQ9mS1Uvh3tEX/qaoi/82eB/rOmQycyJQaEsqWFQAAAAAAAAAAANagBwDSnxA606EJ45OuNP9Qt1neQbVYdDyyWDs/s1dDQrdcgFC6ZN2Psjj/zKQF/s2fCoqunzsIt54sDv9tAADQnSQN158IsJ+tKv9Ot1XiRq9QPuShCg63qiY9uqsnPt2fEA1Cs2MyTLtt0JyyLP/OpQTrvKUcR6enKnnMnhce2J4NUMalEfJht1T+Q7RTc7yqIjaKt07BZsBv+GnAbveAu1q6q687Jz65cE9hu2D1vakO/8ilCoiRqjKNw6AaddyhCKOprCX/Sblf2oesM0CTtkTMT8SC6z7Fj347xpRrSMiQ2nLAcKpxrUsYS71wx6KxK//Opge2gqs2d7ykGb7dpAjdkK82/0S1WqqxrCNzar9q/z3EioS3aWABMtSuADrKoHBVypPToLBFFUW9d6OLtkP/zKgKx3+uNW26phfk2aUG+YaxO/9Es1mHq64sj1jDfP8+wYJmQ9G0J0DOqmNBzqOrWMmRkp+WKwZCvnuniLZI/8enCrt8rz1xv6YW99mlBfuJsTr/RLRbd7KtJ4JiwnT/QMODlVLHmgtMzaNRWcmTXIC+chFEum0kRMN/2pqzO//FqA+Sd68/iMWjE/jcpgbilq80/0K4Yoi/qRxQhrlS+kLGi+ZDvHxMZpdOBGWRPAJGu3YnPcSEql/CcP+1rh/wqakiUISuNrzQogzc3KQHpLarH/9Rt1vCg6gzIK6vJ7Z1vmH/RsWK7UHDi7o9xYm0QMeM4VfEfP+hszT9w6gWilOzU1GfrCbz1qEKldajD0vTpgrweLNE+EK0WF3Cqhsota8jupi2QPt/u1r/eb1c/4u5TP+rsSruwKwXh2axRjJ4sTzHxaUQ59ifEDnMoSkJ2qIJobioGf9gtE/hQbRUTbKoJxW+qx1YuasdkbusGZ7CrBh8vaocOk+xUDR2sDu7vacT/tagCoOvmU8C1qAQANSfFifXnwjMtKgd/2qzRe5Os1CaQbNTTT2yUjRBsFI3QLJST1aySI2GrjDhwqUQ/9afCLDTnBwU1J0XALqZOwDhowAA0p4VLdafCazGpA/zpaoi/4yuLvt7rzTyfK408o2sLfuwqBn/0aMH8digCZbRnBgb1Z0OAK2OZwAAAAAAqIddAMqeEADHmyAM1Z4OUdegB6bUoQbe0aIH+NGiB/vWoAjj1Z8IqdafD0zQoyEI06MYAAAAAAAAAAAAwA8AAIAHAACAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAADAAwAA4AcAAA==</Image>
+- <Url type="text/html" method="get" template="https://www.ekoru.org/?ext=palemoon&amp;q={searchTerms}"/>
+- <Url type="application/x-suggestions+json" template="https://ac.ekoru.org/?ext=palemoon&amp;q={searchTerms}"/>
++ <Url type="text/html" method="get" template="https://www.ekoru.org/?ext=newmoon&amp;q={searchTerms}"/>
++ <Url type="application/x-suggestions+json" template="https://ac.ekoru.org/?ext=newmoon&amp;q={searchTerms}"/>
+ </OpenSearchDescription>
+#######################################
+
+Message: Fix the bookmarks
+I used newmoon itself to save a bookmark, and then export the bookmarks to an html file. Then I grabbed the relevant entries and placed them here. Also, I move the "Most Visited" link to bookmarks menu and not on the toolbar.
+diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/generic/profile/bookmarks.html.in Pale-Moon-28.14.1_Release.new/palemoon/locales/generic/profile/bookmarks.html.in
+--- Pale-Moon-28.14.1_Release/palemoon/locales/generic/profile/bookmarks.html.in 2020-09-29 17:11:51.000000000 -0400
++++ Pale-Moon-28.14.1_Release.new/palemoon/locales/generic/profile/bookmarks.html.in 2020-10-01 17:14:16.199289163 -0400
+@@ -11,9 +11,6 @@
+ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
+ <DD>@bookmarks_toolbarfolder_description@
+ <DL><p>
+- <DT><A HREF="http://www.palemoon.org/" ICON_URI="http://www.palemoon.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfjBQQNKi3s6zvVAAAAB3RJTUUH4wUFDiY4QniqfgAAAAlwSFlzAAAK8AAACvABQqw0mAAAAn1JREFUeNpVU9FKW0EUnLO7NzdFY5uqRSMSoSj1F/paP0EEoU/2H/pWIkiLX+GzH5HnQj9BENQqpSgWkdbeu/fubudsCKQ3CSS7M3PmzDmRb5f3mH1SShsGcmAF7wTYaGMC35cQjBNwYoxczeJlKpASrAFGHYOP3cKUJMO3Cb4JMPwhIggJdZNwLEaOKBiU52bIp73S7jp+iyyJFNG2/JBlSBYC6KrsWhnR1XYQ2Sc1GuRKcTTXMbudwqpcfokxUPtamV/heGWdgaVKYWXPpvRp0sLF/ZB3Z72uKx0B3ocswis8VQ0CRf7yTMWflRZTh00bq1awpS18IK8kXltBQWDbBroK2X7Byxc9m9tIk7Qyju66EThwjHhHyS3DQpG0dSYVEELM9rWdyKskmmDMEpaphjpAnOw4VhuayAMGBi85cX0UzF7xVEfUdJNyV5Ltu5wNYIJsOK1GPji6TFKBkm3wJxq6iLQkMWVXhkmqkAktHHF/qgDnfXsZUhi03mTVqm7gFKiDzuPUXWg4FabPqbdRRVWcZOcuiJXx02P1VgjU8HJM2rtWysFOzh1dcXSaPizolEKdue5Yvp7fDn+efz+LtS81Bt2YIHn1Jn0SqLO31ubwtLzlGfekerm5vuWss1fzz3vHtxc/RpE9q4cmkcCKUW2yGc2EFLQpTdcei8OVL8a567zKCyuLR78f6u37m7s9iS0rE1HrhD1qilXC6vyIddCr/mr/dH516bNy8ypz3mHwZrD/anPt0JuyqkOBqtJlKrhMFk2dUPkID1MtvV45XNsevCcn/vdvnD6+btbvbn4dPNw+7lSVH+pZOde96i8vjJcH/ZNO6a5n8f8A5KRcUpQlS3kAAAAASUVORK5CYII=">Pale Moon</A>
+- <DT><A HREF="https://forum.palemoon.org/index.php" ICON_URI="https://forum.palemoon.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfjBQQNKi3s6zvVAAAAB3RJTUUH4wUFDiY4QniqfgAAAAlwSFlzAAAK8AAACvABQqw0mAAAAn1JREFUeNpVU9FKW0EUnLO7NzdFY5uqRSMSoSj1F/paP0EEoU/2H/pWIkiLX+GzH5HnQj9BENQqpSgWkdbeu/fubudsCKQ3CSS7M3PmzDmRb5f3mH1SShsGcmAF7wTYaGMC35cQjBNwYoxczeJlKpASrAFGHYOP3cKUJMO3Cb4JMPwhIggJdZNwLEaOKBiU52bIp73S7jp+iyyJFNG2/JBlSBYC6KrsWhnR1XYQ2Sc1GuRKcTTXMbudwqpcfokxUPtamV/heGWdgaVKYWXPpvRp0sLF/ZB3Z72uKx0B3ocswis8VQ0CRf7yTMWflRZTh00bq1awpS18IK8kXltBQWDbBroK2X7Byxc9m9tIk7Qyju66EThwjHhHyS3DQpG0dSYVEELM9rWdyKskmmDMEpaphjpAnOw4VhuayAMGBi85cX0UzF7xVEfUdJNyV5Ltu5wNYIJsOK1GPji6TFKBkm3wJxq6iLQkMWVXhkmqkAktHHF/qgDnfXsZUhi03mTVqm7gFKiDzuPUXWg4FabPqbdRRVWcZOcuiJXx02P1VgjU8HJM2rtWysFOzh1dcXSaPizolEKdue5Yvp7fDn+efz+LtS81Bt2YIHn1Jn0SqLO31ubwtLzlGfekerm5vuWss1fzz3vHtxc/RpE9q4cmkcCKUW2yGc2EFLQpTdcei8OVL8a567zKCyuLR78f6u37m7s9iS0rE1HrhD1qilXC6vyIddCr/mr/dH516bNy8ypz3mHwZrD/anPt0JuyqkOBqtJlKrhMFk2dUPkID1MtvV45XNsevCcn/vdvnD6+btbvbn4dPNw+7lSVH+pZOde96i8vjJcH/ZNO6a5n8f8A5KRcUpQlS3kAAAAASUVORK5CYII=" LAST_CHARSET="UTF-8">Pale Moon forum</A>
+- <DT><A HREF="https://forum.palemoon.org/viewforum.php?f=24" ICON_URI="http://www.palemoon.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfjBQQNKi3s6zvVAAAAB3RJTUUH4wUFDiY4QniqfgAAAAlwSFlzAAAK8AAACvABQqw0mAAAAn1JREFUeNpVU9FKW0EUnLO7NzdFY5uqRSMSoSj1F/paP0EEoU/2H/pWIkiLX+GzH5HnQj9BENQqpSgWkdbeu/fubudsCKQ3CSS7M3PmzDmRb5f3mH1SShsGcmAF7wTYaGMC35cQjBNwYoxczeJlKpASrAFGHYOP3cKUJMO3Cb4JMPwhIggJdZNwLEaOKBiU52bIp73S7jp+iyyJFNG2/JBlSBYC6KrsWhnR1XYQ2Sc1GuRKcTTXMbudwqpcfokxUPtamV/heGWdgaVKYWXPpvRp0sLF/ZB3Z72uKx0B3ocswis8VQ0CRf7yTMWflRZTh00bq1awpS18IK8kXltBQWDbBroK2X7Byxc9m9tIk7Qyju66EThwjHhHyS3DQpG0dSYVEELM9rWdyKskmmDMEpaphjpAnOw4VhuayAMGBi85cX0UzF7xVEfUdJNyV5Ltu5wNYIJsOK1GPji6TFKBkm3wJxq6iLQkMWVXhkmqkAktHHF/qgDnfXsZUhi03mTVqm7gFKiDzuPUXWg4FabPqbdRRVWcZOcuiJXx02P1VgjU8HJM2rtWysFOzh1dcXSaPizolEKdue5Yvp7fDn+efz+LtS81Bt2YIHn1Jn0SqLO31ubwtLzlGfekerm5vuWss1fzz3vHtxc/RpE9q4cmkcCKUW2yGc2EFLQpTdcei8OVL8a567zKCyuLR78f6u37m7s9iS0rE1HrhD1qilXC6vyIddCr/mr/dH516bNy8ypz3mHwZrD/anPt0JuyqkOBqtJlKrhMFk2dUPkID1MtvV45XNsevCcn/vdvnD6+btbvbn4dPNw+7lSVH+pZOde96i8vjJcH/ZNO6a5n8f8A5KRcUpQlS3kAAAAASUVORK5CYII=">F.A.Q.</A>
+- <DT><A HREF="http://www.palemoon.org/releasenotes.shtml" ICON_URI="http://www.palemoon.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfjBQQNKi3s6zvVAAAAB3RJTUUH4wUFDiY4QniqfgAAAAlwSFlzAAAK8AAACvABQqw0mAAAAn1JREFUeNpVU9FKW0EUnLO7NzdFY5uqRSMSoSj1F/paP0EEoU/2H/pWIkiLX+GzH5HnQj9BENQqpSgWkdbeu/fubudsCKQ3CSS7M3PmzDmRb5f3mH1SShsGcmAF7wTYaGMC35cQjBNwYoxczeJlKpASrAFGHYOP3cKUJMO3Cb4JMPwhIggJdZNwLEaOKBiU52bIp73S7jp+iyyJFNG2/JBlSBYC6KrsWhnR1XYQ2Sc1GuRKcTTXMbudwqpcfokxUPtamV/heGWdgaVKYWXPpvRp0sLF/ZB3Z72uKx0B3ocswis8VQ0CRf7yTMWflRZTh00bq1awpS18IK8kXltBQWDbBroK2X7Byxc9m9tIk7Qyju66EThwjHhHyS3DQpG0dSYVEELM9rWdyKskmmDMEpaphjpAnOw4VhuayAMGBi85cX0UzF7xVEfUdJNyV5Ltu5wNYIJsOK1GPji6TFKBkm3wJxq6iLQkMWVXhkmqkAktHHF/qgDnfXsZUhi03mTVqm7gFKiDzuPUXWg4FabPqbdRRVWcZOcuiJXx02P1VgjU8HJM2rtWysFOzh1dcXSaPizolEKdue5Yvp7fDn+efz+LtS81Bt2YIHn1Jn0SqLO31ubwtLzlGfekerm5vuWss1fzz3vHtxc/RpE9q4cmkcCKUW2yGc2EFLQpTdcei8OVL8a567zKCyuLR78f6u37m7s9iS0rE1HrhD1qilXC6vyIddCr/mr/dH516bNy8ypz3mHwZrD/anPt0JuyqkOBqtJlKrhMFk2dUPkID1MtvV45XNsevCcn/vdvnD6+btbvbn4dPNw+7lSVH+pZOde96i8vjJcH/ZNO6a5n8f8A5KRcUpQlS3kAAAAASUVORK5CYII=">Release notes</A>
++ <DT><A HREF="https://start.duckduckgo.com/" ICON_URI="https://start.duckduckgo.com/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFnklEQVRYhcVXb0wTZxzmEyZsbovJnG7xw0j2wZm55K4jWzQh0wwkZFsMgetVMhVB0Bm3ocEMo2MoEZcwkzlYLIHJUIGJdraoiAwq2yRz0TEcTgz3p73SUQo97or0P88+dDutvXqd27I3edP70N/7/N7n97y/PykpSS5U5adyhoxshibqOYrsZyjdKEMR3ujWjXIU2c/QRD1nyMhGVX5qsudqrpFNK5ZwFNnA0DqJ1ZNwVBbC3VwL0dQE2WqGbDVDNDXB3VwLR2UhWD0JhtZJHEU2jGxaseSRgZGTs4AvIKs5mpi178iF1N2O0LQLwQkBcp8Jnk4j3I01cDfWwNNphNxnQnBCQGjaBam7HfYdueBoYpYvIKuRk7PgEW5NDPJFmZixtCLslSCaWyDsLgCrJx+6hd0FEM0tCHslzFhawW3OBEcRg0mzwdLESobWCUJ5HoJOG+SBLti2rdMEfnDbtq2DPNCFoNMGoTwPDK0ThA3kS5o3Z2id4KwuRVgS4TYeBKsnMb6/CFJ3B6Tes5g++RnsO99O2hG38SDCkghndSkYWickZAI5OQs4ihgUyvOiBjXblUM8HV8gLHlw//L9dgNCeV5STjhrtiMsiRDK88BRxKCqJvgCspovykTQaVNurtBZlg1bWTZcR/fCPzaiOBGWRbiNB8AXr9FmorEGQacNfFEm+AKyOl50NDE7Y2mFfMUSZ8xveR13b3yHRCvsnYHz4xJNJ+SBrqgwaWI2JhQcRTbYd+Qi7JVUBecf+zUhuOKEOAW+9A1NYYa9UvSJUmRDNPZV+akMrZOk7naI547HGU0cqQAAcOMeXP2Zx5w/FAd+i3HhwsBtOCwdmiyI5hZI3e1gaJ2EqvzUFM6Qkc3qSYSmXarvfOZiGwDg+ohDk4VIwAe+ZK1mnghNu8DqSXCGjOwUhibqHZWFCE4Iqgaz1/oVgEAwDFH2qYK3fHMdg0M2uI7u1WQhOCHAUVkIhibqUziK7Hc3H4bcZ1IXjtWigBTv68T6nV/BF4gPQ/4HJ/BJkxVSz2ltMfaZ4G6uBUeR/SkMpRsVTU3wdBpV/+w506iAtJ0fwv6jPaoMzM9Hf2Xrn6/IQMJZsRyexmWY+fI5jO968d6ZnUaIpiYwlG40haEIr2w1w91Yo+rARN1uzdhjfg7w3QS8vZjrN2D2zGKEf3ockeE0RIbTEPzhCTgrlsfkBNlqBkMRXk0HbO/mPgTYj3nnLkRuPqmAKfuXNNw1Pw3XgRfAbohPSrLVDIbWyZohYPVkXBpW8IWSKNjQY5BOLYW3YwnktqWYqkuHbevLCc+LCUFUhLUJRcjqyYRZcF4oRmQ4Db5LizSFl1iEGs+Q1ZPwnD6mHoKwiLnL6YgMp2HWtBhTdelwH07H1KfPY6blWfguLULo2kLYy1Y+5BlqJCJWT+L3w+8llIH9/fWwl67EVF06vJ3PIDDwFELXFsLXswieY8tgL40Fj0tEManY3KLqAF+yNqEDQgX1t+iPS8XJFCNWTyI4Oa7qwOTn+5IGVy1GceV4oEvV2HtVPQE9WL5vF+rA0AnEl6gcazUkrJ7EVOsRAAAj3cJ57hQm56KMRO56wRa+ijFahxOHVmN7dxa697wWZ+82HkTQaQO3WaUh0WrJWD2J8Y+2AACuOLpQ0puFrd9m49CPu7CzLx9ll9Zh79drUNKbhZLeLLTXrI6xTaoli2lKD8Q2payeBPfOKsxHwrjq7FGADJYs5bu49953a+3qmJsn1ZT+teLa8isWRZgB/g6G3IMK0Mbzb8LQlYWii2+h7dRGVJ2MsnC6etWjteUxonxwMDl3HN7By3DNjWPP94W4wLfDH55TxBhwcGDpV8B8SMFj+QeDyf2aUBvNQqIbfv4O/PwoAvYxBOxj8POj8PN3EJp0/jujWTwb/8NwGsfIfzSe/wEDn3UUirFnMwAAAABJRU5ErkJggg==">ddg</A>
+ </DL><p>
+ </DL><p>
diff --git a/newmoon/small-icons.patch b/newmoon/small-icons.patch
new file mode 100644
index 0000000..03d364a
--- /dev/null
+++ b/newmoon/small-icons.patch
@@ -0,0 +1,22 @@
+--- UXP-PM28.3.0_Release.orig/palemoon/base/content/browser.xul 2019-01-08 11:42:01.000000000 -0500
++++ UXP-PM28.3.0_Release/palemoon/base/content/browser.xul 2019-02-04 06:57:38.943983285 -0500
+@@ -355,7 +355,7 @@
+
+ <toolbox id="navigator-toolbox"
+ defaultmode="icons" mode="icons"
+- iconsize="large">
++ iconsize="small">
+ <!-- Menu -->
+ <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
+ defaultset="menubar-items"
+@@ -381,8 +381,8 @@
+ <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
+ toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
+ fullscreentoolbar="true" mode="icons" customizable="true"
+- iconsize="large"
+- defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,bookmarks-menu-button,history-menu-button,downloads-button,window-controls"
++ iconsize="small"
++ defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,bookmarks-menu-button,history-menu-button,downloads-button,window-controls"
+ context="toolbar-context-menu">
+
+ <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
diff --git a/ublock-origin-combined/ublock-origin-combined.spec b/ublock-origin-combined/ublock-origin-combined.spec
index 7360f92..1e82cde 100644
--- a/ublock-origin-combined/ublock-origin-combined.spec
+++ b/ublock-origin-combined/ublock-origin-combined.spec
@@ -1,14 +1,13 @@
-# palemoon
%global extdir1 %{_libdir}/palemoon/browser/extensions
%global extdir2 %{_libdir}/palemoon-stackrpms/browser/extensions
-# waterfox
%global extdir3 %{_datadir}/waterfox/extensions/%{app_id}
+%global extdir4 %{_libdir}/newmoon/browser/extensions
%global app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
Name: ublock-origin-combined
Version: 1.16.4.28
-Release: 1
+Release: 2
Summary: uBlock Origin installed to the system Mozilla-based extensions directories
Group: Applications/Internet
@@ -21,7 +20,7 @@ BuildRequires: coreutils
BuildArch: noarch
Obsoletes: palemoon-ublock-origin <= 1.16.4.25-1, palemoon-stackrpms-ublock-origin <= 1.16.4.25-1, waterfox-ublock-origin <= 1.16.4.25-1
-Conflicts: palemoon-ublock-origin, palemoon-stackrpms-ublock-origin, waterfox-ublock-origin
+Conflicts: palemoon-ublock-origin, palemoon-stackrpms-ublock-origin, waterfox-ublock-origin, newmoon-ublock-origin
%if 0%{?fedora} || ( 0%{?rhel} >= 8 )
Suggests: mozilla-filesystem
@@ -49,11 +48,14 @@ newfilename="$( grep 'em:id' install.rdf 2>/dev/null | head -n1 | sed -r -e 's/^
test -z "${newfilename}" && newfilename="$( basename %{SOURCE1} )"
rm -rf install.rdf
+mkdir -p %{buildroot}%{extdir1} %{buildroot}%{extdir2} %{buildroot}%{extdir3} %{buildroot}%{extdir4}
+
# palemoon
-mkdir -p %{buildroot}%{extdir1} %{buildroot}%{extdir2} %{buildroot}%{extdir3}
install -Dp -m0644 %{SOURCE1} %{buildroot}%{extdir1}/${newfilename}
+# firefox
ln -s %{extdir1}/${newfilename} %{buildroot}%{extdir2}
-
+# newmoon
+ln -s %{extdir1}/${newfilename} %{buildroot}%{extdir4}
# waterfox
ln -sf %{extdir1}/${newfilename} %{buildroot}%{extdir3}
@@ -68,6 +70,9 @@ rm -rf %{buildroot}
# something gets weird because of the curly braces in the expanded variable, but using the ../* syntax changes the evaluated string so it does not have to try to use curly braces in the owned filepath.
%changelog
+* Thu Mar 18 2021 B. Stack <bgstack15@gmail.com> - 1.16.4.28-2
+- Add newmoon
+
* Mon Feb 01 2021 B. Stack <bgstack15@gmail.com> - 1.16.4.28-1
- Update
bgstack15