--- a/MozillaFirefox/MozillaFirefox.changes Wed Jan 06 13:42:41 2010 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes Wed Jan 06 22:03:46 2010 +0100
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 6 17:15:40 CET 2010 - wr@rosenauer.org
+
+- update to 3.6rc1
+- replace PreReq with other Requires
+
-------------------------------------------------------------------
Thu Dec 24 14:22:38 CET 2009 - wr@rosenauer.org
--- a/MozillaFirefox/MozillaFirefox.spec Wed Jan 06 13:42:41 2010 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec Wed Jan 06 22:03:46 2010 +0100
@@ -1,8 +1,8 @@
#
-# spec file for package MozillaFirefox (Version 3.6b5)
+# spec file for package MozillaFirefox (Version 3.6rc1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2006-2009 Wolfgang Rosenauer
+# 2006-2010 Wolfgang Rosenauer
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
Name: MozillaFirefox
%define xulrunner mozilla-xulrunner192
BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel orbit-devel python unzip update-desktop-files zip
-BuildRequires: %{xulrunner}-devel = 1.9.2b5
+BuildRequires: %{xulrunner}-devel = 1.9.2rc1
%if %suse_version > 1020
BuildRequires: fdupes
%endif
@@ -34,9 +34,9 @@
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
Provides: web_browser
Provides: firefox
-Version: 3.6b5
+Version: 3.6rc1
Release: 1
-%define releasedate 2009120400
+%define releasedate 2010010500
Summary: Mozilla Firefox Web Browser
Url: http://www.mozilla.org/
Group: Productivity/Networking/Web/Browsers
@@ -64,7 +64,8 @@
Patch10: firefox-ui-lockdown.patch
Patch11: firefox-crashreporter.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-PreReq: coreutils /bin/sh shared-mime-info desktop-file-utils
+Requires(post): coreutils shared-mime-info desktop-file-utils
+Requires(postun): shared-mime-info desktop-file-utils
Requires: %{xulrunner} >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' %{xulrunner})
%requires_eq %{xulrunner}
%ifarch %ix86
@@ -100,7 +101,7 @@
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
Provides: locale(%{name}:ar;ca;cs;da;de;en_GB;es_AR;es_CL;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW)
Group: System/Localization
-PreReq: %{name} = %{version}
+Requires: %{name} = %{version}
Requires: %{xulrunner}-translations-common
Obsoletes: %{name}-translations < %{version}-%{release}
@@ -111,9 +112,9 @@
%package translations-other
Summary: Extra translations for MozillaFirefox
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi)
+Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;ku;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi)
Group: System/Localization
-PreReq: %{name} = %{version}
+Requires: %{name} = %{version}
Requires: %{xulrunner}-translations-other
Obsoletes: %{name}-translations < %{version}-%{release}
@@ -372,13 +373,19 @@
%if %localize
%files translations-common -f %{_tmppath}/translations.common
%defattr(-,root,root)
+%dir %{progdir}
+%dir %{progdir}/chrome/
%files translations-other -f %{_tmppath}/translations.other
%defattr(-,root,root)
+%dir %{progdir}
+%dir %{progdir}/chrome/
%endif
%files branding-upstream
%defattr(-,root,root)
+%dir %{progdir}
+%dir %{progdir}/defaults/
%{progdir}/browserconfig.properties
%{progdir}/defaults/profile/bookmarks.html
--- a/mozilla-breakpad-update.patch Wed Jan 06 13:42:41 2010 +0100
+++ b/mozilla-breakpad-update.patch Wed Jan 06 22:03:46 2010 +0100
@@ -9215,11 +9215,6 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#include <signal.h>
--#include <sys/stat.h>
--#include <sys/types.h>
--#include <unistd.h>
--#include <stdio.h>
+// The ExceptionHandler object installs signal handlers for a number of
+// signals. We rely on the signal handler running on the thread which crashed
+// in order to identify it. This is true of the synchronous signals (SEGV etc),
@@ -9248,25 +9243,23 @@
+// V
+// sys_exit
+//
-
--#include <cassert>
--#include <cstdlib>
--#include <ctime>
--#include <linux/limits.h>
++
+// This code is a little fragmented. Different functions of the ExceptionHandler
+// class run in a number of different contexts. Some of them run in a normal
+// context and are easy to code, others run in a compromised context and the
+// restrictions at the top of minidump_writer.cc apply: no libc and use the
+// alternative malloc. Each function should have comment above it detailing the
+// context which it runs in.
-
- #include "client/linux/handler/exception_handler.h"
++
++#include "client/linux/handler/exception_handler.h"
+
+#include <errno.h>
+#include <fcntl.h>
+#include <linux/limits.h>
+#include <sched.h>
-+#include <signal.h>
+ #include <signal.h>
+-#include <sys/stat.h>
+-#include <sys/types.h>
+#include <stdio.h>
+#include <sys/mman.h>
+#include <sys/signal.h>
@@ -9275,15 +9268,22 @@
+#include <sys/user.h>
+#include <sys/wait.h>
+#include <ucontext.h>
-+#include <unistd.h>
-+
+ #include <unistd.h>
+
+-#include <cassert>
+-#include <cstdlib>
+-#include <cstdio>
+-#include <ctime>
+-#include <linux/limits.h>
+#include "common/linux/linux_libc_support.h"
+#include "common/linux/linux_syscall_support.h"
+#include "common/linux/memory.h"
+#include "client/linux/minidump_writer/minidump_writer.h"
- #include "common/linux/guid_creator.h"
++#include "common/linux/guid_creator.h"
+
+-#include "client/linux/handler/exception_handler.h"
+-#include "common/linux/guid_creator.h"
-#include "google_breakpad/common/minidump_format.h"
-+
+// A wrapper for the tgkill syscall: send a signal to a specific thread.
+static int tgkill(pid_t tgid, pid_t tid, int sig) {
+ syscall(__NR_tgkill, tgid, tid, sig);
@@ -11274,9 +11274,9 @@
-#include <sys/wait.h>
-
-#include <cstdlib>
+-#include <cstdio>
-#include <ctime>
-#include <string.h>
--#include <stdio.h>
-
-#include "common/linux/file_id.h"
-#include "client/linux/handler/linux_thread.h"
@@ -40953,9 +40953,9 @@
-#include <a.out.h>
-#include <cstdarg>
-#include <cstdlib>
+-#include <cstdio>
+#include <assert.h>
#include <cxxabi.h>
--#include <stdio.h>
#include <elf.h>
#include <errno.h>
#include <fcntl.h>
@@ -41936,16 +41936,9 @@
diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h
-@@ -29,20 +29,21 @@
- //
- // dump_symbols.cc: Implements a linux stab debugging format dumper.
- //
-
- #ifndef COMMON_LINUX_DUMP_SYMBOLS_H__
- #define COMMON_LINUX_DUMP_SYMBOLS_H__
-
+@@ -36,14 +36,14 @@
#include <string>
-+#include <cstdio>
+ #include <cstdio>
namespace google_breakpad {
@@ -65745,7 +65738,7 @@
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
-@@ -182,16 +182,17 @@ SHARED_LIBRARY_LIBS += \
+@@ -179,16 +179,17 @@ SHARED_LIBRARY_LIBS += \
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/mac/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/mac/$(LIB_PREFIX)breakpad_mac_common_s.$(LIB_SUFFIX)
--- a/mozilla-breakpad.patch Wed Jan 06 13:42:41 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-From: Wolfgang Rosenauer <wr@rosenauer.org>
-Subject: missing declaration with newer compilers
-
-diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
---- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
-+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
-@@ -28,16 +28,17 @@
- // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- #include <signal.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <stdio.h>
-
- #include <cassert>
- #include <cstdlib>
- #include <ctime>
- #include <linux/limits.h>
-
- #include "client/linux/handler/exception_handler.h"
- #include "common/linux/guid_creator.h"
-diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
---- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
-+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
-@@ -36,16 +36,17 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <sys/utsname.h>
- #include <sys/wait.h>
-
- #include <cstdlib>
- #include <ctime>
- #include <string.h>
-+#include <stdio.h>
-
- #include "common/linux/file_id.h"
- #include "client/linux/handler/linux_thread.h"
- #include "client/minidump_file_writer.h"
- #include "client/minidump_file_writer-inl.h"
- #include "google_breakpad/common/minidump_format.h"
- #include "client/linux/handler/minidump_generator.h"
-
-diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
---- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
-+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
-@@ -26,16 +26,17 @@
- // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- #include <a.out.h>
- #include <cstdarg>
- #include <cstdlib>
- #include <cxxabi.h>
-+#include <stdio.h>
- #include <elf.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <link.h>
- #include <sys/mman.h>
- #include <stab.h>
- #include <sys/stat.h>
- #include <sys/types.h>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-milestone.patch Wed Jan 06 22:03:46 2010 +0100
@@ -0,0 +1,14 @@
+diff --git a/config/milestone.txt b/config/milestone.txt
+--- a/config/milestone.txt
++++ b/config/milestone.txt
+@@ -5,9 +5,9 @@
+ # x.x.x.x
+ # x.x.x+
+ #
+ # Referenced by milestone.pl.
+ # Hopefully I'll be able to automate replacement of *all*
+ # hardcoded milestones in the tree from these two files.
+ #--------------------------------------------------------
+
+-1.9.2
++1.9.2.0
--- a/mozilla-xulrunner192/create-tar.sh Wed Jan 06 13:42:41 2010 +0100
+++ b/mozilla-xulrunner192/create-tar.sh Wed Jan 06 22:03:46 2010 +0100
@@ -1,7 +1,7 @@
#!/bin/bash
-RELEASE_TAG="FIREFOX_3_6b5_RELEASE"
-VERSION="1.9.2b5"
+RELEASE_TAG="FIREFOX_3_6rc1_RELEASE"
+VERSION="1.9.2rc1"
# mozilla
hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla
--- a/mozilla-xulrunner192/mozilla-breakpad.patch Wed Jan 06 13:42:41 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-breakpad.patch
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-xulrunner192/mozilla-milestone.patch Wed Jan 06 22:03:46 2010 +0100
@@ -0,0 +1,1 @@
+../mozilla-milestone.patch
\ No newline at end of file
--- a/mozilla-xulrunner192/mozilla-xulrunner192.changes Wed Jan 06 13:42:41 2010 +0100
+++ b/mozilla-xulrunner192/mozilla-xulrunner192.changes Wed Jan 06 22:03:46 2010 +0100
@@ -1,6 +1,8 @@
-------------------------------------------------------------------
-Wed Jan 6 13:24:43 CET 2010 - wr@rosenauer.org
+Wed Jan 6 14:10:25 CET 2010 - wr@rosenauer.org
+- update to 1.9.2rc1
+ * removed obsolete mozilla-breakpad.patch
- expand -translations-* and -gnome filelists to clean up the
filesystem for upgrades and removals correctly
- enable crashreporter and create breakpad buildsymbols package
--- a/mozilla-xulrunner192/mozilla-xulrunner192.spec Wed Jan 06 13:42:41 2010 +0100
+++ b/mozilla-xulrunner192/mozilla-xulrunner192.spec Wed Jan 06 22:03:46 2010 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package mozilla-xulrunner192 (Version 1.9.2b5)
+# spec file for package mozilla-xulrunner192 (Version 1.9.2rc1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# 2006-2010 Wolfgang Rosenauer
@@ -39,12 +39,12 @@
BuildRequires: wireless-tools
%endif
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version: 1.9.2b5
+Version: 1.9.2rc1
Release: 1
-%define releasedate 2009120400
-%define version_internal 1.9.2b5
+%define releasedate 2010010500
+%define version_internal 1.9.2.0
%define apiversion 1.9.2
-%define uaweight 191999
+%define uaweight 192000
Summary: Mozilla Runtime Environment 1.9.2
Url: http://www.mozilla.org
Group: Productivity/Other
@@ -82,8 +82,8 @@
Patch12: gecko-lockdown.patch
Patch13: toolkit-ui-lockdown.patch
# ---
-Patch14: mozilla-breakpad.patch
-Patch15: mozilla-breakpad-update.patch
+Patch14: mozilla-breakpad-update.patch
+Patch15: mozilla-milestone.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): update-alternatives coreutils
Requires(preun): update-alternatives coreutils
@@ -163,7 +163,7 @@
Summary: Extra translations for XULRunner 1.9.2
Group: System/Localization
Requires: %{name} = %{version}
-Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi)
+Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;ku;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi)
Obsoletes: %{name}-translations < %{version}-%{release}
%description translations-other
@@ -218,7 +218,7 @@
%patch12 -p1
%patch13 -p1
%patch14 -p1
-#%patch15 -p1
+%patch15 -p1
%build
%if %suse_version >= 1110
--- a/series Wed Jan 06 13:42:41 2010 +0100
+++ b/series Wed Jan 06 22:03:46 2010 +0100
@@ -12,8 +12,8 @@
mozilla-gconf-backend.patch
gecko-lockdown.patch
toolkit-ui-lockdown.patch
-mozilla-breakpad.patch
mozilla-breakpad-update.patch
+mozilla-milestone.patch
# Firefox patches
firefox-libxul-sdk.patch