--- a/MozillaFirefox-branding-openSUSE.changes Thu Jan 31 09:29:43 2013 +0100
+++ b/MozillaFirefox-branding-openSUSE.changes Sun Jun 16 23:57:59 2013 +0200
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 25 22:41:28 UTC 2013 - wr@rosenauer.org
+
+- modified file locations for Firefox 21 and above
+
-------------------------------------------------------------------
Thu Jan 31 07:40:17 UTC 2013 - wr@rosenauer.org
--- a/MozillaFirefox-branding-openSUSE.spec Thu Jan 31 09:29:43 2013 +0100
+++ b/MozillaFirefox-branding-openSUSE.spec Sun Jun 16 23:57:59 2013 +0200
@@ -21,7 +21,7 @@
BuildRequires: bc
BuildRequires: unzip
BuildRequires: zip
-Version: 6.1
+Version: 21
Release: 0
Summary: openSUSE branding of MozillaFirefox
License: BSD-3-Clause and GPL-2.0+
@@ -61,15 +61,16 @@
%install
install -d $RPM_BUILD_ROOT%{progdir}
+install -d $RPM_BUILD_ROOT%{progdir}/browser
# custom bookmarks
-install -d $RPM_BUILD_ROOT%{progdir}/defaults/profile
-install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{progdir}/defaults/profile/bookmarks.html
+install -d $RPM_BUILD_ROOT%{progdir}/browser/defaults/profile
+install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{progdir}/browser/defaults/profile/bookmarks.html
# apply SUSE defaults
install -d $RPM_BUILD_ROOT%{progdir}/defaults/pref
-install -d $RPM_BUILD_ROOT%{progdir}/defaults/preferences
+install -d $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences
sed -e 's,GSSAPI,%{libgssapi},g' \
%{SOURCE3} > suse-default-prefs
-install -m0644 suse-default-prefs $RPM_BUILD_ROOT%{progdir}/defaults/preferences/firefox-openSUSE.js
+install -m0644 suse-default-prefs $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/firefox-openSUSE.js
rm suse-default-prefs
install -m0644 %{SOURCE7} $RPM_BUILD_ROOT%{progdir}/defaults/pref/
# distribution.ini
@@ -78,10 +79,10 @@
%{SOURCE5} > distribution.ini
install -m 0644 distribution.ini $RPM_BUILD_ROOT%{progdir}/distribution/
# search plugins
-install -d $RPM_BUILD_ROOT%{progdir}/searchplugins
+install -d $RPM_BUILD_ROOT%{progdir}/browser/searchplugins
sed -e 's,%VERSION%,%{suseversion},g' \
- %{SOURCE1} > $RPM_BUILD_ROOT%{progdir}/searchplugins/opensuse-software.xml
-cp %{SOURCE8} $RPM_BUILD_ROOT%{progdir}/searchplugins/
+ %{SOURCE1} > $RPM_BUILD_ROOT%{progdir}/browser/searchplugins/opensuse-software.xml
+cp %{SOURCE8} $RPM_BUILD_ROOT%{progdir}/browser/searchplugins/
# install the system extension
mkdir susefox\@opensuse.org
(cd susefox\@opensuse.org; unzip ../susefox.xpi)
@@ -99,12 +100,14 @@
%dir %{progdir}
%dir %{progdir}/defaults/
%dir %{progdir}/defaults/pref
-%dir %{progdir}/defaults/preferences
%{progdir}/defaults/pref/all-openSUSE.js
-%{progdir}/defaults/preferences/firefox-openSUSE.js
-%dir %{progdir}/defaults/profile/
-%{progdir}/defaults/profile/bookmarks.html
-%{progdir}/searchplugins/
+%dir %{progdir}/browser/
+%dir %{progdir}/browser/defaults
+%dir %{progdir}/browser/defaults/preferences
+%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