# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1437383902 -7200
# Node ID 4b7dcb9dae3691e1aaceb5d8b576bd8504ba0fb4
# Parent  388aee66777203616c9a00b46db3fd10531e88e1
moved searchplugins to new location

diff -r 388aee667772 -r 4b7dcb9dae36 MozillaFirefox-branding-openSUSE.changes
--- a/MozillaFirefox-branding-openSUSE.changes	Sun Jun 16 23:57:59 2013 +0200
+++ b/MozillaFirefox-branding-openSUSE.changes	Mon Jul 20 11:18:22 2015 +0200
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 20 09:06:54 UTC 2015 - wr@rosenauer.org
+
+- searchplugins need to be placed under distribution with FF 40
+
 -------------------------------------------------------------------
 Mon Mar 25 22:41:28 UTC 2013 - wr@rosenauer.org
 
diff -r 388aee667772 -r 4b7dcb9dae36 MozillaFirefox-branding-openSUSE.spec
--- a/MozillaFirefox-branding-openSUSE.spec	Sun Jun 16 23:57:59 2013 +0200
+++ b/MozillaFirefox-branding-openSUSE.spec	Mon Jul 20 11:18:22 2015 +0200
@@ -21,7 +21,7 @@
 BuildRequires:  bc
 BuildRequires:  unzip
 BuildRequires:  zip
-Version:        21
+Version:        40
 Release:        0
 Summary:        openSUSE branding of MozillaFirefox
 License:        BSD-3-Clause and GPL-2.0+
@@ -79,10 +79,10 @@
    %{SOURCE5} > distribution.ini
 install -m 0644 distribution.ini $RPM_BUILD_ROOT%{progdir}/distribution/
 # search plugins
-install -d $RPM_BUILD_ROOT%{progdir}/browser/searchplugins
+install -d $RPM_BUILD_ROOT%{progdir}/distribution/searchplugins/common/
 sed -e 's,%VERSION%,%{suseversion},g' \
-  %{SOURCE1} > $RPM_BUILD_ROOT%{progdir}/browser/searchplugins/opensuse-software.xml
-cp %{SOURCE8} $RPM_BUILD_ROOT%{progdir}/browser/searchplugins/
+  %{SOURCE1} > $RPM_BUILD_ROOT%{progdir}/distribution/searchplugins/common/opensuse-software.xml
+cp %{SOURCE8} $RPM_BUILD_ROOT%{progdir}/distribution/searchplugins/common/
 # install the system extension
 mkdir susefox\@opensuse.org
 (cd susefox\@opensuse.org; unzip ../susefox.xpi)
@@ -107,7 +107,6 @@
 %dir %{progdir}/browser/defaults/profile/
 %{progdir}/browser/defaults/preferences/firefox-openSUSE.js
 %{progdir}/browser/defaults/profile/bookmarks.html
-%{progdir}/browser/searchplugins/
 %{progdir}/distribution
 %{_datadir}/mozilla