diff --git a/firefox-searchengines-google.xml b/firefox-searchengines-google.xml new file mode 100644 index 0000000..fc2508f --- /dev/null +++ b/firefox-searchengines-google.xml @@ -0,0 +1,17 @@ + +Google +Google Search +UTF-8 +data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA + + + + + + + + + + +http://www.google.com/ + diff --git a/firefox.spec b/firefox.spec index 4b312c6..85b7738 100644 --- a/firefox.spec +++ b/firefox.spec @@ -6,7 +6,7 @@ %define pluginsdir %{_libdir}/mozilla/plugins %define firefox_channel release -%define release 5 +%define release 6 # this seems fragile, so require the exact version or later (#58754) %define sqlite3_version %(pkg-config --modversion sqlite3 &>/dev/null && pkg-config --modversion sqlite3 2>/dev/null || echo 0) @@ -23,11 +23,13 @@ Group: Networking/WWW Url: http://www.firefox.com/ Source0: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{realver}/source/firefox-%{realver}.source.tar.bz2 Source4: firefox.desktop -Source5: firefox-searchengines-jamendo.xml -Source6: firefox-searchengines-exalead.xml -Source8: firefox-searchengines-askcom.xml +#Source5: firefox-searchengines-jamendo.xml +#Source6: firefox-searchengines-exalead.xml +#Source8: firefox-searchengines-askcom.xml Source9: kde.js Source10: firefox-searchengines-yandex.xml +Source11: firefox-searchengines-google.xml + Patch1: firefox-lang.patch Patch2: firefox-vendor.patch Patch3: firefox-disable-check-default-browser.patch @@ -228,9 +230,10 @@ rm -f %{buildroot}%{mozillalibdir}/precomplete install -D -m644 browser/app/profile/prefs.js %{buildroot}%{mozillalibdir}/defaults/profile/prefs.js cat << EOF >> %{buildroot}%{mozillalibdir}/defaults/profile/prefs.js -user_pref("browser.search.selectedEngine","Yandex"); -user_pref("browser.search.order.1","Yandex"); -user_pref("browser.search.order.2","Google"); +user_pref("browser.search.selectedEngine", "Yandex"); +user_pref("browser.search.order.1", "Yandex"); +user_pref("browser.search.order.2", "Google"); +user_pref("browser.search.defaultenginename", "Yandex"); user_pref("browser.EULA.override", true); user_pref("browser.shell.checkDefaultBrowser", false); user_pref("browser.ctrlTab.previews", true); @@ -261,9 +264,10 @@ pref("browser.ctrlTab.previews", true); pref("browser.display.use_system_colors", true); pref("browser.download.folderList", 1); pref("browser.link.open_external", 3); -pref("browser.search.order.1","Yandex"); -pref("browser.search.order.2","Google"); -pref("browser.search.selectedEngine","Yandex"); +pref("browser.search.order.1", "Yandex"); +pref("browser.search.order.2", "Google"); +pref("browser.search.selectedEngine", "Yandex"); +pref("browser.search.defaultenginename", "Yandex"); pref("browser.shell.checkDefaultBrowser", false); pref("browser.tabs.insertRelatedAfterCurrent", false); pref("dom.ipc.plugins.enabled.nswrapper*", false); @@ -273,14 +277,16 @@ pref("network.manage-offline-status", true); EOF # search engines -cp -f %{SOURCE5} %{buildroot}%{mozillalibdir}/searchplugins/jamendo.xml -cp -f %{SOURCE6} %{buildroot}%{mozillalibdir}/searchplugins/exalead.xml -cp -f %{SOURCE8} %{buildroot}%{mozillalibdir}/searchplugins/askcom.xml +rm -f %{buildroot}%{mozillalibdir}/searchplugins/* +#cp -f %{SOURCE5} %{buildroot}%{mozillalibdir}/searchplugins/jamendo.xml +#cp -f %{SOURCE6} %{buildroot}%{mozillalibdir}/searchplugins/exalead.xml +#cp -f %{SOURCE8} %{buildroot}%{mozillalibdir}/searchplugins/askcom.xml cp -f %{SOURCE10} %{buildroot}%{mozillalibdir}/searchplugins/yandex.xml +cp -f %{SOURCE11} %{buildroot}%{mozillalibdir}/searchplugins/google.xml # Correct distro values on search engines -sed -i 's/@DISTRO_VALUE@/ffx/' %{buildroot}%{mozillalibdir}/searchplugins/askcom.xml -sed -i 's/@DISTRO_VALUE@//' %{buildroot}%{mozillalibdir}/searchplugins/exalead.xml +#sed -i 's/@DISTRO_VALUE@/ffx/' %{buildroot}%{mozillalibdir}/searchplugins/askcom.xml +#sed -i 's/@DISTRO_VALUE@//' %{buildroot}%{mozillalibdir}/searchplugins/exalead.xml mkdir -p %{buildroot}%{_sys_macros_dir} cat <%{buildroot}%{_sys_macros_dir}/%{name}.macros