--- a/MozillaFirefox/MozillaFirefox.spec Sun Dec 20 14:08:35 2009 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec Mon Dec 21 12:18:17 2009 +0100
@@ -21,7 +21,7 @@
Name: MozillaFirefox
%define xulrunner mozilla-xulrunner192
-BuildRequires: autoconf213 gcc-c++ libgnomeui-devel libidl-devel libnotify-devel orbit-devel python unzip update-desktop-files zip
+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
%if %suse_version > 1020
BuildRequires: fdupes
@@ -62,6 +62,7 @@
Patch8: firefox-appname.patch
Patch9: firefox-kde.patch
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: %{xulrunner} >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' %{xulrunner})
@@ -162,6 +163,7 @@
install -m 644 %{SOURCE6} browser/app/profile/kde.js
%endif
%patch10 -p1
+%patch11 -p1
%build
export MOZ_BUILD_DATE=%{releasedate}
@@ -198,7 +200,6 @@
ac_add_options --disable-updater
ac_add_options --disable-tests
ac_add_options --disable-debug
-ac_add_options --disable-crashreporter
EOF
%if %branding
cat << EOF >> $MOZCONFIG
@@ -355,6 +356,9 @@
%{progdir}/%{progname}
%{progdir}/application.ini
%{progdir}/blocklist.xml
+%ifarch %ix86
+%{progdir}/crashreporter-override.ini
+%endif
%{_datadir}/applications/%{name}.desktop
%{_datadir}/mime/packages/%{progname}.xml
%{_datadir}/pixmaps/firefox*
@@ -363,8 +367,8 @@
%endif
%{_bindir}/%{progname}
%doc %{_mandir}/man1/%{progname}.1.gz
+
%if %localize
-
%files translations-common -f %{_tmppath}/translations.common
%defattr(-,root,root)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/firefox-crashreporter.patch Mon Dec 21 12:18:17 2009 +0100
@@ -0,0 +1,1 @@
+../firefox-crashreporter.patch
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/firefox-crashreporter.patch Mon Dec 21 12:18:17 2009 +0100
@@ -0,0 +1,19 @@
+diff --git a/browser/app/application.ini b/browser/app/application.ini
+--- a/browser/app/application.ini
++++ b/browser/app/application.ini
+@@ -53,13 +53,13 @@ ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384
+ [Gecko]
+ MinVersion=@GRE_MILESTONE@
+ MaxVersion=@GRE_MILESTONE@
+
+ [XRE]
+ EnableProfileMigrator=1
+ EnableExtensionManager=1
+
++#ifdef MOZ_CRASHREPORTER
+ [Crash Reporter]
+-#if MOZILLA_OFFICIAL
+ Enabled=1
++ServerURL=https://crash-reports.mozilla.com/submit
+ #endif
+-ServerURL=https://crash-reports.mozilla.com/submit
--- a/series Sun Dec 20 14:08:35 2009 +0100
+++ b/series Mon Dec 21 12:18:17 2009 +0100
@@ -24,3 +24,4 @@
firefox-appname.patch
firefox-kde.patch
firefox-ui-lockdown.patch
+firefox-crashreporter.patch