Merge branch 'rosa2016.1' into rosa2014.1

This commit is contained in:
Andrey Bondrov 2017-02-27 19:38:39 +10:00
commit 240317a535
3 changed files with 5 additions and 2 deletions

View file

@ -1,2 +1,3 @@
sources:
Pale-Moon-27.1.0_Release.tar.gz: a96eff1da71eee668713f389126db9f1eb9d1126
icons.tar.bz2: 625177825178215f8bb80f097fc3595daabece24

View file

@ -18,11 +18,12 @@
Summary: Web browser based on Goanna engine
Name: newmoon
Version: 27.1.0
Release: 1
Release: 2
License: MPLv2.0
Group: Networking/WWW
Url: http://www.palemoon.org
Source0: https://github.com/MoonchildProductions/Pale-Moon/archive/%{version}_Release.tar.gz?/%{oname}-%{version}_Release.tar.gz
Source2: icons.tar.bz2
Source1: localstore.rdf
Source4: %{name}.desktop
Source5: firefox-searchengines-yandex.xml
@ -134,6 +135,7 @@ Files and macros mainly for building New Moon extensions.
%prep
%setup -qn %{oname}-%{version}_Release
tar xf %{SOURCE2}
%patch1 -p1 -b .lang
%patch3 -p1 -b .disable-software-update

View file

@ -21,7 +21,7 @@ diff -Naur Pale-Moon-27.1.0_Release.orig/browser/branding/shared/pref/uaoverride
pref("@GUAO_PREF@.citi.com","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
+// Consultant doesn't work
+pref("@GUAO_PREF@.consultant.ru","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
+pref("@GUAO_PREF@.consultant.ru","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @GRE_VERSION_SLICE@ @FX_SLICE@ @PM_SLICE@");
+
// UA-Sniffing domains below have indicated no interest in supporting Pale Moon (BOO!)
pref("@GUAO_PREF@.humblebundle.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");