From 23bd90fbec47edb29e7903d10b2f295afa8ad8bf Mon Sep 17 00:00:00 2001 From: akdengi Date: Fri, 5 Oct 2012 22:14:04 +0400 Subject: [PATCH] fix spec --- firefox.desktop | 2 +- firefox.spec | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/firefox.desktop b/firefox.desktop index b7fc67b..7f72603 100644 --- a/firefox.desktop +++ b/firefox.desktop @@ -149,5 +149,5 @@ Icon=firefox Terminal=false Type=Application StartupWMClass=Firefox -MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml; +MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;x-scheme-handler/http;x-scheme-handler/https; Categories=GTK;Network;WebBrowser;X-MandrivaLinux-Internet-WebBrowsers;X-MandrivaLinux-CrossDesktop; diff --git a/firefox.spec b/firefox.spec index 5a12a66..a2879e1 100644 --- a/firefox.spec +++ b/firefox.spec @@ -27,7 +27,7 @@ %define _use_syshunspell 1 -%define release 1 +%define release 2 %define update_channel release @@ -45,7 +45,13 @@ Source0: ftp://ftp.mozilla.org/pub/mozilla.org/%{name}/releases/%{realver}/sourc Source0: ftp://ftp.mozilla.org/pub/mozilla.org/%{name}/releases/%{realver}/source/%{name}-%{realver}.source.tar.bz2 %endif Source4: %{name}.desktop +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 +Source12: firefox-searchengines-bing.xml Patch1: firefox-6.0-lang.patch Patch2: firefox-vendor.patch Patch3: mozilla-firefox-1.5.0.6-systemproxy.patch @@ -350,6 +356,19 @@ ln -s %{_datadir}/hunspell %{buildroot}%{mozillalibdir}/dictionaries # (lm) touch and %ghost bookmarks.html to a proper uninstall touch %{buildroot}%{mozillalibdir}/defaults/profile/bookmarks.html +# search engines +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 +cp -f %{SOURCE12} %{buildroot}%{mozillalibdir}/searchplugins/bing.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 + mkdir -p %{buildroot}%{_sys_macros_dir} cat <%{buildroot}%{_sys_macros_dir}/%{name}.macros # Macros from %{name} package