Hello community, here is the log from the commit of package MozillaFirefox-branding-openSUSE for openSUSE:Factory checked in at Mon Jun 6 14:07:51 CEST 2011. -------- --- MozillaFirefox-branding-openSUSE/MozillaFirefox-branding-openSUSE.changes 2010-10-26 09:44:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/MozillaFirefox-branding-openSUSE/MozillaFirefox-branding-openSUSE.changes 2011-05-21 14:33:03.000000000 +0200 @@ -1,0 +2,14 @@ +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) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- susefox-20101026.tar.bz2 New: ---- all-openSUSE.js susefox-20110521.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.002EQn/_old 2011-06-06 14:01:40.000000000 +0200 +++ /var/tmp/diff_new_pack.002EQn/_new 2011-06-06 14:01:40.000000000 +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) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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,24 @@ # 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 +43,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. @@ -63,11 +64,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' \ @@ -77,10 +79,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} @@ -98,17 +100,21 @@ %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 ++++++ // openSUSE overrides for default settings pref("layout.word_select.stop_at_punctuation", false); pref("intl.locale.matchOS", true); ++++++ susefox-20101026.tar.bz2 -> susefox-20110521.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susefox/install.rdf new/susefox/install.rdf --- old/susefox/install.rdf 2010-10-26 09:40:24.000000000 +0200 +++ new/susefox/install.rdf 2011-05-21 14:30:24.000000000 +0200 @@ -111,7 +111,7 @@ <Description> em:id{ec8030f7-c20a-464f-9b0e-13a3a9e97384} em:minVersion3.0 - em:maxVersion4.0.* + em:maxVersion5.0.* </Description> </Description> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susefox/pfs/db/114.sql new/susefox/pfs/db/114.sql --- old/susefox/pfs/db/114.sql 2010-10-26 09:40:24.000000000 +0200 +++ new/susefox/pfs/db/114.sql 2011-05-21 14:30:24.000000000 +0200 @@ -15,7 +15,7 @@ "application/x-shockwave-flash", "i586", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}", - "11.3", + "11.4", "http://software.opensuse.org/ymp/openSUSE:11.4:NonFree/standard/flash-player...", 9, "libflashplayer.so", @@ -39,7 +39,7 @@ "application/x-shockwave-flash", "i586", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}", - "11.3", + "11.4", "http://software.opensuse.org/ymp/openSUSE:11.4/standard/gnash.ymp", 8, "libgnashplugin.so", @@ -63,7 +63,7 @@ "application/x-shockwave-flash", "i586", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}", - "11.3", + "11.4", "http://software.opensuse.org/ymp/openSUSE:11.4/standard/swfdec-mozilla.ymp", 8, "libswfdecmozilla.so", @@ -87,7 +87,7 @@ "application/x-silverlight", "i586", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}", - "11.3", + "11.4", "http://software.opensuse.org/ymp/openSUSE:11.4/standard/moonlight-plugin.ymp", 5, "libmoonloader.so", @@ -111,7 +111,7 @@ "application/x-silverlight-2", "i586", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}", - "11.3", + "11.4", "http://software.opensuse.org/ymp/openSUSE:11.4/standard/moonlight-plugin.ymp", 5, "libmoonloader.so", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susefox/pfs/db/recreatedb.sh new/susefox/pfs/db/recreatedb.sh --- old/susefox/pfs/db/recreatedb.sh 2010-10-26 09:40:24.000000000 +0200 +++ new/susefox/pfs/db/recreatedb.sh 2011-05-21 14:30:24.000000000 +0200 @@ -40,7 +40,7 @@ echo echo -distributionIDs="11.1 11.2 11.3" +distributionIDs="11.1 11.2 11.3 11.4" for distro in $distributionIDs; do echo ... for $distro ... Files old/susefox/pfs/web/pfs.sqlite and new/susefox/pfs/web/pfs.sqlite differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org