Mercurial Mercurial > hg > firefox-branding-opensuse / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update for Firefox 5 and higher (standalone edition)
authorWolfgang Rosenauer <wr@rosenauer.org>
Fri, 15 Apr 2011 08:55:45 +0200
changeset 7 9b3c0c88075a
parent 5 d2a01cd71ca2
child 8 f089e41153dd
update for Firefox 5 and higher (standalone edition)
MozillaFirefox-branding-openSUSE.changes file | annotate | diff | comparison | revisions
MozillaFirefox-branding-openSUSE.spec file | annotate | diff | comparison | revisions
all-openSUSE.js file | annotate | diff | comparison | revisions 
--- a/MozillaFirefox-branding-openSUSE.changes	Tue Oct 26 09:43:24 2010 +0200
+++ b/MozillaFirefox-branding-openSUSE.changes	Fri Apr 15 08:55:45 2011 +0200
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Apr 15 06:08:26 UTC 2011 - wr@rosenauer.org
+
+- update to version 5.0
+  * supports openSUSE Firefox 5 and higher
+    (compatibility with standalone Firefox)
+- added all-openSUSE.js (previously in xulrunner)
+
 -------------------------------------------------------------------
 Tue Oct 26 09:41:05 CEST 2010 - wr@rosenauer.org
 
--- a/MozillaFirefox-branding-openSUSE.spec	Tue Oct 26 09:43:24 2010 +0200
+++ b/MozillaFirefox-branding-openSUSE.spec	Fri Apr 15 08:55:45 2011 +0200
@@ -1,8 +1,8 @@
 #
-# spec file for package MozillaFirefox-branding-openSUSE (Version 4.0)
+# spec file for package MozillaFirefox-branding-openSUSE
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2008-2010 Wolfgang Rosenauer
+# Copyright (c) 2008-2011 Wolfgang Rosenauer
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,10 +18,10 @@
 
 # norootforbuild
 
-BuildRequires:  MozillaFirefox bc unzip zip gconf2-devel
+BuildRequires:  MozillaFirefox bc unzip zip
 Name:           MozillaFirefox-branding-openSUSE
 License:        BSD3c(or similar) ; GPLv2+
-Version:        4.0
+Version:        5.0
 Release:        1
 Summary:        openSUSE branding of MozillaFirefox
 Group:          Productivity/Networking/Web/Browsers
@@ -32,8 +32,9 @@
 Source4:        firefox.schemas
 Source5:        distribution.ini.in
 Source6:        %{name}-COPYING
+Source7:        all-openSUSE.js
 Provides:       MozillaFirefox-branding = %{version}
-PreReq:         MozillaFirefox >= 3.5
+PreReq:         MozillaFirefox >= 4.99
 Conflicts:      otherproviders(MozillaFirefox-branding)
 Supplements:    packageand(MozillaFirefox:branding-openSUSE)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -41,8 +42,8 @@
 %define progdir %{_prefix}/%_lib/firefox
 %define libgssapi libgssapi_krb5.so.2
 %define suseversion %(echo -e "scale=1\\n%{suse_version}/100" | bc 2>/dev/null)
-%define gconf_confdir %{_sysconfdir}/gconf
-%gconf_schemas_prereq
+#%define gconf_confdir %{_sysconfdir}/gconf
+#%gconf_schemas_prereq
 
 %description
 This package provides openSUSE Look and Feel for MozillaFirefox.
@@ -62,11 +63,12 @@
 install -d $RPM_BUILD_ROOT%{progdir}/defaults/profile
 install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{progdir}/defaults/profile/bookmarks.html
 # apply SUSE defaults
-install -d $RPM_BUILD_ROOT%{progdir}/defaults/preferences
+install -d $RPM_BUILD_ROOT%{progdir}/defaults/pref
 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}/defaults/pref/firefox-openSUSE.js
 rm suse-default-prefs
+install -m0644 %{SOURCE7} $RPM_BUILD_ROOT%{progdir}/defaults/pref/
 # distribution.ini
 install -d $RPM_BUILD_ROOT%{progdir}/distribution
 sed -e 's,%VERSION%,%{suseversion},g' \
@@ -76,10 +78,10 @@
 install -d $RPM_BUILD_ROOT%{progdir}/searchplugins
 (cd $RPM_BUILD_ROOT%{progdir}/searchplugins ; tar xjf %{SOURCE1})
 # SCHEMA file
-mkdir -p $RPM_BUILD_ROOT%{gconf_confdir}/schemas
-install -m 644 %{SOURCE4} \
-               $RPM_BUILD_ROOT%{gconf_confdir}/schemas/
-%find_gconf_schemas
+#mkdir -p $RPM_BUILD_ROOT%{gconf_confdir}/schemas
+#install -m 644 %{SOURCE4} \
+#               $RPM_BUILD_ROOT%{gconf_confdir}/schemas/
+#%%find_gconf_schemas
 # browserconfig.properties
 cat << EOF >> suse-browserconfig.properties
 browser.startup.homepage=%{default_home_page}
@@ -97,17 +99,20 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre -f %{name}.schemas_pre
+#%pre -f %{name}.schemas_pre
 
-%preun -f %{name}.schemas_preun
+#%preun -f %{name}.schemas_preun
 
-%posttrans -f %{name}.schemas_posttrans
+#%posttrans -f %{name}.schemas_posttrans
 
-%files -f %{name}.schemas_list
+#%files -f %{name}.schemas_list
+%files
 %defattr(-,root,root)
 %doc COPYING.susefox
 %doc ../COPYING
-%{progdir}/defaults/preferences/firefox-openSUSE.js
+%{progdir}/defaults/pref/all-openSUSE.js
+%{progdir}/defaults/pref/firefox-openSUSE.js
+%dir %{progdir}/defaults/profile/
 %{progdir}/defaults/profile/bookmarks.html
 %{progdir}/browserconfig.properties
 %{progdir}/searchplugins/*
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/all-openSUSE.js	Fri Apr 15 08:55:45 2011 +0200
@@ -0,0 +1,3 @@
+// openSUSE overrides for default settings
+pref("layout.word_select.stop_at_punctuation", false);
+pref("intl.locale.matchOS", true);
firefox-branding-opensuse