[firefox] Keep compatibility with old preference dir

Martin Stransky stransky at fedoraproject.org
Wed May 15 12:11:09 UTC 2013


commit 77ca0b85b6b22039f320b573592c2d3b06a5a083
Author: Martin Stransky <stransky at redhat.com>
Date:   Wed May 15 14:11:49 2013 +0200

    Keep compatibility with old preference dir

 firefox.spec |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/firefox.spec b/firefox.spec
index 116801e..7a6f35c 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -55,7 +55,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        21.0
-Release:        1%{?pre_tag}%{?dist}
+Release:        2%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -340,8 +340,15 @@ create_default_langpack "pt-PT" "pt"
 create_default_langpack "sv-SE" "sv"
 create_default_langpack "zh-TW" "zh"
 
-# New preferences dir
+# Keep compatibility with the old preference location 
+# on Fedora 18 and earlier
+%if 0%{?fedora} < 19
+%{__mkdir_p} $RPM_BUILD_ROOT/%{mozappdir}/defaults/preferences
+%{__mkdir_p} $RPM_BUILD_ROOT/%{mozappdir}/browser/defaults
+ln -s %{mozappdir}/defaults/preferences $RPM_BUILD_ROOT/%{mozappdir}/browser/defaults/preferences
+%else
 %{__mkdir_p} $RPM_BUILD_ROOT/%{mozappdir}/browser/defaults/preferences
+%endif
 
 # System extensions
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions/%{firefox_app_id}
@@ -396,7 +403,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %dir %{mozappdir}/browser/components
 %{mozappdir}/browser/components/*.so
 %{mozappdir}/browser/components/components.manifest
+%if 0%{?fedora} < 19
+%dir %{mozappdir}/defaults/preferences
+%{mozappdir}/browser/defaults/preferences
+%else
 %dir %{mozappdir}/browser/defaults/preferences
+%endif
 %attr(644, root, root) %{mozappdir}/browser/blocklist.xml
 %dir %{mozappdir}/browser/extensions
 %{mozappdir}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
@@ -430,6 +442,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Wed May 15 2013 Martin Stransky <stransky at redhat.com> - 21.0-2
+- Keep compatibility with old preference dir
+
 * Tue May 14 2013 Martin Stransky <stransky at redhat.com> - 21.0-1
 - Updated to latest upstream (21.0)
 


More information about the scm-commits mailing list