# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1344618474 -7200
# Node ID b8efa78151c10d960aa74f0f06f9132ed0acb0b4
# Parent  d32a41c5bf415602ec728807e340ce01e73e344d
move Firefox specific prefs to defaults/preferences (bnc#774914)

diff -r d32a41c5bf41 -r b8efa78151c1 MozillaFirefox-branding-openSUSE.changes
--- a/MozillaFirefox-branding-openSUSE.changes	Wed Jun 27 06:07:07 2012 +0200
+++ b/MozillaFirefox-branding-openSUSE.changes	Fri Aug 10 19:07:54 2012 +0200
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Aug  7 21:40:45 UTC 2012 - wr@rosenauer.org
+
+- move Firefox specific prefs to defaults/preferences (bnc#774914)
+
 -------------------------------------------------------------------
 Tue Jun 26 21:29:12 UTC 2012 - wr@rosenauer.org
 
diff -r d32a41c5bf41 -r b8efa78151c1 MozillaFirefox-branding-openSUSE.spec
--- a/MozillaFirefox-branding-openSUSE.spec	Wed Jun 27 06:07:07 2012 +0200
+++ b/MozillaFirefox-branding-openSUSE.spec	Fri Aug 10 19:07:54 2012 +0200
@@ -21,7 +21,7 @@
 BuildRequires:  bc
 BuildRequires:  unzip
 BuildRequires:  zip
-Version:        6.0
+Version:        6.1
 Release:        0
 Summary:        openSUSE branding of MozillaFirefox
 License:        BSD-3-Clause ; GPL-2.0+
@@ -65,9 +65,10 @@
 install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{progdir}/defaults/profile/bookmarks.html
 # apply SUSE defaults
 install -d $RPM_BUILD_ROOT%{progdir}/defaults/pref
+install -d $RPM_BUILD_ROOT%{progdir}/defaults/preferences
 sed -e 's,GSSAPI,%{libgssapi},g' \
    %{SOURCE3} > suse-default-prefs
-install -m0644 suse-default-prefs $RPM_BUILD_ROOT%{progdir}/defaults/pref/firefox-openSUSE.js
+install -m0644 suse-default-prefs $RPM_BUILD_ROOT%{progdir}/defaults/preferences/firefox-openSUSE.js
 rm suse-default-prefs
 install -m0644 %{SOURCE7} $RPM_BUILD_ROOT%{progdir}/defaults/pref/
 # distribution.ini
@@ -96,8 +97,9 @@
 %dir %{progdir}
 %dir %{progdir}/defaults/
 %dir %{progdir}/defaults/pref
+%dir %{progdir}/defaults/preferences
 %{progdir}/defaults/pref/all-openSUSE.js
-%{progdir}/defaults/pref/firefox-openSUSE.js
+%{progdir}/defaults/preferences/firefox-openSUSE.js
 %dir %{progdir}/defaults/profile/
 %{progdir}/defaults/profile/bookmarks.html
 %{progdir}/searchplugins/