Hello community, here is the log from the commit of package MozillaFirefox checked in at Fri Jun 2 02:01:29 CEST 2006. -------- --- MozillaFirefox/MozillaFirefox.changes 2006-05-23 21:13:01.000000000 +0200 +++ MozillaFirefox/MozillaFirefox.changes 2006-06-01 20:35:51.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 1 20:34:43 CEST 2006 - stark@suse.de + +- update to security/stability release 1.5.0.4 (#179011) +- moved locale-global prefs to browserconfig.properties (#177881) + +------------------------------------------------------------------- Old: ---- 1.5.0.3.patch default_homepage.diff default_homepage.diff.sle10 firefox-1.5.0.3-source.tar.bz2 New: ---- firefox-1.5.0.4-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.66uauJ/_old 2006-06-02 02:00:35.000000000 +0200 +++ /var/tmp/diff_new_pack.66uauJ/_new 2006-06-02 02:00:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 1.5.0.3) +# spec file for package MozillaFirefox (Version 1.5.0.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,8 +20,8 @@ %if %sles_version == 10 Obsoletes: mozilla %endif -Version: 1.5.0.3 -Release: 11 +Version: 1.5.0.4 +Release: 1 Summary: Mozilla Firefox Web Browser URL: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -39,10 +39,8 @@ Source16: firefox.1 Source17: firefox-suse-default-prefs.js Source18: firefox.schemas -Patch0: 1.5.0.3.patch Patch1: visibility.patch Patch2: rpath.patch -Patch3: default_homepage.diff Patch4: pango-cairo.patch Patch5: abuild.patch # NSPR bmo #270502 @@ -83,7 +81,6 @@ Patch33: observer-lock.patch # integration Patch34: skin-selection.patch -Patch35: default_homepage.diff.sle10 # pango-cairo.patch dbus.patch startup.patch Patch100: configure.patch # system-nss.patch @@ -107,7 +104,7 @@ Requires: mozilla-nss >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nss`) %endif %define _unpackaged_files_terminate_build 0 -%define releasedate 2006042500 +%define releasedate 2006052700 %define progname firefox %define progdir %{_prefix}/%_lib/firefox %define nld9 %(if grep -q sles9-sld /.buildenv; then echo 1; else echo 0; fi) @@ -154,15 +151,8 @@ %prep %setup -n mozilla -b 7 -b 4 -b 8 -q cd $RPM_BUILD_DIR/mozilla -%patch0 %patch1 %patch2 -# home-page -%if %sles_version == 10 -%patch35 -%else -%patch3 -%endif %patch4 %patch5 %patch6 @@ -249,7 +239,6 @@ ac_add_options --enable-static ac_add_options --disable-shared ac_add_options --disable-tests -ac_add_options --enable-startup-notification #ac_add_options --enable-debug EOF %if %is_plus || %suse_version >= 930 @@ -278,6 +267,11 @@ ac_add_options --enable-extensions="dbus default" EOF %endif +%if %suse_version >= 1010 +cat << EOF >> $MOZCONFIG +ac_add_options --enable-startup-notification +EOF +%endif %if %milestone cat << EOF >> $MOZCONFIG ac_add_options --enable-official-branding @@ -356,13 +350,21 @@ (cd $RPM_BUILD_ROOT%{progdir}/searchplugins ; tar xjf %{SOURCE5}) # browserconfig.properties %if %sles_version == 10 -sed "s;browser.startup.homepage=.*;browser.startup.homepage=http://www.novell.com/linux/suselinux;g -s;browser.startup.homepage_reset=.*;browser.startup.homepage_reset=http://www.novell.com/linux/suselinux;g" \ - dist/firefox/browserconfig.properties > $RPM_BUILD_ROOT%{progdir}/browserconfig.properties -%else sed "s;browser.startup.homepage=.*;browser.startup.homepage=http://www.novell.com/linux/sle10;g s;browser.startup.homepage_reset=.*;browser.startup.homepage_reset=http://www.novell.com/linux/sle10;g" \ dist/firefox/browserconfig.properties > $RPM_BUILD_ROOT%{progdir}/browserconfig.properties +cat << EOF >> $RPM_BUILD_ROOT%{progdir}/browserconfig.properties +browser.throbber.url=http://www.novell.com/linux/sle10 +startup.homepage_override_url=http://www.novell.com/linux/sle10 +EOF +%else +sed "s;browser.startup.homepage=.*;browser.startup.homepage=http://www.novell.com/linux/suselinux/%suse_version;g +s;browser.startup.homepage_reset=.*;browser.startup.homepage_reset=http://www.novell.com/linux/suselinux/%suse_version;g" \ + dist/firefox/browserconfig.properties > $RPM_BUILD_ROOT%{progdir}/browserconfig.properties +cat << EOF >> $RPM_BUILD_ROOT%{progdir}/browserconfig.properties +browser.throbber.url=http://www.novell.com/linux/suselinux/%suse_version +startup.homepage_override_url=http://www.novell.com/linux/suselinux/%suse_version +EOF %endif mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ %if %milestone @@ -496,6 +498,9 @@ %defattr(-,root,root) %changelog -n MozillaFirefox +* Thu Jun 01 2006 - stark@suse.de +- update to security/stability release 1.5.0.4 (#179011) +- moved locale-global prefs to browserconfig.properties (#177881) * Tue May 23 2006 - stark@suse.de - complete implementation of startup-notification (#115417) (including autoconf and remote support) ++++++ firefox-1.5.0.3-source.tar.bz2 -> firefox-1.5.0.4-source.tar.bz2 ++++++ MozillaFirefox/firefox-1.5.0.3-source.tar.bz2 MozillaFirefox/firefox-1.5.0.4-source.tar.bz2 differ: char 11, line 1 ++++++ firefox-suse-default-prefs.js ++++++ --- MozillaFirefox/firefox-suse-default-prefs.js 2006-05-23 21:12:59.000000000 +0200 +++ MozillaFirefox/firefox-suse-default-prefs.js 2006-06-01 20:21:39.000000000 +0200 @@ -16,3 +16,5 @@ pref("print.print_edge_left", 16); // 1/100 of an inch pref("print.print_edge_right", 16); // 1/100 of an inch pref("print.print_edge_bottom", 14); // 1/100 of an inch +pref("startup.homepage_override_url", "resource:/browserconfig.properties"); +pref("browser.throbber.url", "resource:/browserconfig.properties"); ++++++ l10n.tar.bz2 ++++++ MozillaFirefox/l10n.tar.bz2 MozillaFirefox/l10n.tar.bz2 differ: char 11, line 1 ++++++ observer-lock.patch ++++++ --- /var/tmp/diff_new_pack.66uauJ/_old 2006-06-02 02:00:39.000000000 +0200 +++ /var/tmp/diff_new_pack.66uauJ/_new 2006-06-02 02:00:39.000000000 +0200 @@ -7,17 +7,17 @@ Index: xpcom/ds/nsObserverList.cpp =================================================================== RCS file: /cvsroot/mozilla/xpcom/ds/nsObserverList.cpp,v -retrieving revision 3.31 -diff -u -p -6 -r3.31 nsObserverList.cpp ---- xpcom/ds/nsObserverList.cpp 30 Jul 2004 02:43:13 -0000 3.31 -+++ xpcom/ds/nsObserverList.cpp 16 May 2006 04:09:08 -0000 -@@ -102,32 +102,38 @@ nsresult - nsObserverList::RemoveObserver(nsIObserver* anObserver) - { - PRBool removed = PR_FALSE; +retrieving revision 3.31.30.1 +diff -u -p -6 -r3.31.30.1 nsObserverList.cpp +--- xpcom/ds/nsObserverList.cpp 28 Apr 2006 02:25:00 -0000 3.31.30.1 ++++ xpcom/ds/nsObserverList.cpp 28 May 2006 19:23:22 -0000 +@@ -105,32 +105,37 @@ nsObserverList::RemoveObserver(nsIObserv NS_ENSURE_ARG(anObserver); + // Prevent the observer from being destroyed while we're inside the lock. + nsCOMPtr<nsIObserver> kungFuDeathGrip(anObserver); + - nsAutoLock lock(mLock); - - if (!mObserverList) @@ -37,7 +37,9 @@ - } else - observerRef = anObserver; + } -+ + +- if (!removed && observerRef) +- removed = mObserverList->RemoveElement(observerRef); + nsAutoLock lock(mLock); + + if (!mObserverList) @@ -46,12 +48,9 @@ + if (observerRef) { + removed = mObserverList->RemoveElement(observerRef); + } - -- if (!removed && observerRef) -- removed = mObserverList->RemoveElement(observerRef); -+ if (!removed && anObserver) { -+ removed = mObserverList->RemoveElement(anObserver); -+ } ++ ++ if (!removed && anObserver) ++ removed = mObserverList->RemoveElement(anObserver); #else + nsAutoLock lock(mLock); + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org