# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1319114523 -7200
# Node ID 01755c4d35453ce55ef08cc66d70173d88ad4781
# Parent  31fc3eccb905c2bf7f80e2cddef4aa7a9a4e0746# Parent  880a90eb0f924f49bf7830aa24969965de16392d
merge from firefox7

diff -r 31fc3eccb905 -r 01755c4d3545 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Thu Oct 20 14:41:39 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Thu Oct 20 14:42:03 2011 +0200
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 20 12:34:47 UTC 2011 - wr@rosenauer.org
+
+- enable telemetry prompt
+
 -------------------------------------------------------------------
 Fri Sep 30 10:52:36 UTC 2011 - wr@rosenauer.org
 
diff -r 31fc3eccb905 -r 01755c4d3545 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Thu Oct 20 14:41:39 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Thu Oct 20 14:42:03 2011 +0200
@@ -236,6 +236,7 @@
 export MOZ_BUILD_DATE=%{releasedate}
 export MOZILLA_OFFICIAL=1
 export BUILD_OFFICIAL=1
+export MOZ_TELEMETRY_REPORTING=1
 export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing"
 %ifarch ppc64
 export CFLAGS="$CFLAGS -mminimal-toc"