--- a/xulrunner/xulrunner.spec	Mon Aug 20 08:55:43 2012 +0200
+++ b/xulrunner/xulrunner.spec	Tue Sep 11 19:27:09 2012 +0200
@@ -42,14 +42,14 @@
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  mozilla-nspr-devel >= 4.9.1
+BuildRequires:  mozilla-nspr-devel >= 4.9.2
 BuildRequires:  mozilla-nss-devel >= 3.13.6
-Version:        15.98
+Version:        16.98
 Release:        0
-%define         releasedate 2012071800
-%define         version_internal 15.0
-%define         apiversion 15
-%define         uaweight 1500000
+%define         releasedate 2012091000
+%define         version_internal 17.0
+%define         apiversion 17
+%define         uaweight 1700000
 Summary:        Mozilla Runtime Environment
 License:        MPL-2.0
 Group:          Productivity/Other
@@ -70,12 +70,13 @@
 Source9:        compare-locales.tar.bz2
 Patch1:         toolkit-download-folder.patch
 Patch2:         mozilla-pkgconfig.patch
+Patch3:         idldir.patch
 Patch4:         mozilla-nongnome-proxies.patch
 Patch5:         mozilla-prefer_plugin_pref.patch
 Patch6:         mozilla-language.patch
 Patch7:         mozilla-ntlm-full-path.patch
 Patch9:         mozilla-sle11.patch
-Patch13:        mozilla-gstreamer.patch
+Patch12:        mozilla-crashreporter-restart-args.patch
 Patch14:        mozilla-ppc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       mozilla-js = %{version}
@@ -86,7 +87,7 @@
 %define has_system_nss   1
 %define has_system_cairo 0
 %define localize 0
-%ifarch ppc ppc64 s390 s390x ia64
+%ifarch ppc ppc64 s390 s390x ia64 %arm
 %define crashreporter    0
 %else
 %define crashreporter    1
@@ -182,6 +183,7 @@
 %setup -n mozilla -q -b 1 -b 9
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
@@ -189,7 +191,7 @@
 %if %suse_version < 1120
 %patch9 -p1
 %endif
-%patch13 -p1
+%patch12 -p1
 %patch14 -p1
 
 %build
@@ -205,8 +207,13 @@
 %ifarch ppc64
 export CFLAGS="$CFLAGS -mminimal-toc"
 %endif
+export LDFLAGS=" -Wl,-rpath -Wl,${MOZ_APP_DIR}"
+%ifarch %arm
+# debug symbols require too much memory during build
+export CFLAGS="${CFLAGS/-g/}"
+LDFLAGS+="-Wl,--reduce-memory-overheads -Wl,--no-keep-memory"
+%endif
 export CXXFLAGS="$CFLAGS"
-export LDFLAGS="-Wl,-rpath -Wl,${MOZ_APP_DIR}"
 export MOZCONFIG=$RPM_BUILD_DIR/mozconfig
 export MOZILLA_OFFICIAL=1
 export BUILD_OFFICIAL=1
@@ -280,11 +287,12 @@
 # ARM
 %ifarch %arm
 cat << EOF >> $MOZCONFIG
-%ifarch armv7l
+%ifarch armv7l armv7hl
 ac_add_options --with-arch=armv7-a
 ac_add_options --with-float-abi=hard
 ac_add_options --with-fpu=vfpv3-d16
 ac_add_options --with-thumb=yes
+ac_add_options --disable-debug
 %endif
 %ifarch armv5tel
 ac_add_options --with-arch=armv5te
@@ -452,9 +460,7 @@
 %{_libdir}/xulrunner-%{version_internal}/dependentlibs.list
 %{_libdir}/xulrunner-%{version_internal}/mozilla-xremote-client
 %{_libdir}/xulrunner-%{version_internal}/plugin-container
-%{_libdir}/xulrunner-%{version_internal}/run-mozilla.sh
 %{_libdir}/xulrunner-%{version_internal}/xulrunner
-%{_libdir}/xulrunner-%{version_internal}/xulrunner-bin
 %{_libdir}/xulrunner-%{version_internal}/xulrunner-stub
 %{_libdir}/xulrunner-%{version_internal}/platform.ini
 %{_libdir}/xulrunner-%{version_internal}/omni.ja