Accepting request 72377 from mozilla:Factory

OBS-URL: https://build.opensuse.org/request/show/72377
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox-branding-openSUSE?expand=0&rev=28

MozillaFirefox-branding-openSUSE.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sat May 21 12:31:32 UTC 2011 - wr@rosenauer.org
+
+- update susefox
+  * marked compatible with FF5
+
+-------------------------------------------------------------------
+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
 

MozillaFirefox-branding-openSUSE.spec

@@ -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,23 +18,23 @@
 
 # norootforbuild
 
-BuildRequires:  MozillaFirefox bc gconf2-devel unzip zip
-
+BuildRequires:  MozillaFirefox bc unzip zip
 Name:           MozillaFirefox-branding-openSUSE
 License:        BSD3c(or similar) ; GPLv2+
-Version:        4.0
-Release:        2
+Version:        5.0
+Release:        1
 Summary:        openSUSE branding of MozillaFirefox
 Group:          Productivity/Networking/Web/Browsers
-Source:         susefox-20101026.tar.bz2
+Source:         susefox-20110521.tar.bz2
 Source1:        search-addons.tar.bz2
 Source2:        bookmarks.html.suse
 Source3:        firefox-suse-default-prefs.js
 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
@@ -42,8 +42,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %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.
@@ -63,11 +63,12 @@ install -d $RPM_BUILD_ROOT%{progdir}
 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' \
@@ -77,10 +78,10 @@ install -m 0644 distribution.ini $RPM_BUILD_ROOT%{progdir}/distribution/
 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}
@@ -98,17 +99,20 @@ cp -r susefox\@opensuse.org \
 %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/*

all-openSUSE.js

@@ -0,0 +1,3 @@
+// openSUSE overrides for default settings
+pref("layout.word_select.stop_at_punctuation", false);
+pref("intl.locale.matchOS", true);

susefox-20101026.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a14ed4a39bf77a0af528de1e64953b7423c0ac798b8781ff6da546e63c152b2
-size 50564

susefox-20110521.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:22291010d22c7c6e324ae02d2e5cd3722f067e4dab26c8b59c4fc6e882cef571
+size 50704