Merge branch 'master' into f24

3 files changed, 27 insertions, 4 deletions

diff --git a/firefox-mozconfig b/firefox-mozconfig
index ea6f325..ea34e72 100644
--- a/firefox-mozconfig
+++ b/firefox-mozconfig
@@ -3,6 +3,7 @@
 ac_add_options --enable-default-toolkit=cairo-gtk3
 
 ac_add_options --prefix="$PREFIX"
+ac_add_options --libdir="$LIBDIR"
 ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
 ac_add_options --enable-system-hunspell
diff --git a/firefox.spec b/firefox.spec
index 82b563e..cbc89d0 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -109,6 +109,7 @@ Patch20:        firefox-build-prbool.patch
 Patch21:        firefox-ppc64le.patch
 Patch24:        firefox-debug.patch
 Patch25:        rhbz-1219542-s390-build.patch
+Patch26:        mozilla-1282843.patch
 
 # Fedora specific patches
 # Unable to install addons from https pages
@@ -247,6 +248,7 @@ cd %{tarballdir}
 %ifarch s390
 %patch25 -p1 -b .rhbz-1219542-s390
 %endif
+%patch26 -p1 -b .mzbz#1282843
 
 %patch3  -p1 -b .arm
 
@@ -741,10 +743,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/32x32/apps/firefox.png
 %{_datadir}/icons/hicolor/48x48/apps/firefox.png
 %{_datadir}/icons/hicolor/symbolic/apps/firefox-symbolic.svg
-%{mozappdir}/webapprt-stub
-%dir %{mozappdir}/webapprt
-%{mozappdir}/webapprt/omni.ja
-%{mozappdir}/webapprt/webapprt.ini
 %if %{enable_mozilla_crashreporter}
 %{mozappdir}/crashreporter
 %{mozappdir}/crashreporter.ini
diff --git a/mozilla-1282843.patch b/mozilla-1282843.patch
new file mode 100644
index 0000000..d30642c
--- /dev/null
+++ b/mozilla-1282843.patch
@@ -0,0 +1,24 @@
+Add ability to specify system paths to @old_configure_options
+
+--- a/build/moz.configure/old.configure	2016-07-04 12:03:37.503301144 -0400
++++ b/build/moz.configure/old.configure	2016-07-04 12:04:33.443147224 -0400
+@@ -149,16 +149,19 @@
+     def all_options(help):
+         return list(options)
+ 
+     return depends(prepare_configure, extra_old_configure_args, all_options,
+                    *options)
+ 
+ 
+ @old_configure_options(
++    '--libdir',
++    '--includedir',
++    '--datadir',
+     '--cache-file',
+     '--enable-accessibility',
+     '--enable-address-sanitizer',
+     '--enable-alsa',
+     '--enable-android-omx',
+     '--enable-android-resource-constrained',
+     '--enable-approximate-location',
+     '--enable-b2g-bt',