[firefox] build fixes

[Martin Stransky]

commit f1073d2d1207d05610d6d26eb1c4b75515c2c821
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Tue Oct 9 13:54:57 2012 +0200

    build fixes

 firefox-install-dir.patch |   40 +++++++++++++++++++---------------------
 firefox-mozconfig         |    2 --
 firefox.spec              |    7 +++++--
 3 files changed, 24 insertions(+), 25 deletions(-)
---
diff --git a/firefox-install-dir.patch b/firefox-install-dir.patch
index 7ba14f4..e788fa0 100644
--- a/firefox-install-dir.patch
+++ b/firefox-install-dir.patch
@@ -1,25 +1,23 @@
-diff -up firefox-7.0/mozilla-beta/config/autoconf.mk.in.old firefox-7.0/mozilla-beta/config/autoconf.mk.in
---- firefox-7.0/mozilla-beta/config/autoconf.mk.in.old	2011-08-31 21:16:06.000000000 +0200
-+++ firefox-7.0/mozilla-beta/config/autoconf.mk.in	2011-09-06 12:08:00.859392269 +0200
-@@ -68,7 +68,7 @@ datadir		= @datadir@
- mandir		= @mandir@
- idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+diff -up mozilla-aurora-7676a9a06403/config/baseconfig.mk.dir mozilla-aurora-7676a9a06403/config/baseconfig.mk
+--- mozilla-aurora-7676a9a06403/config/baseconfig.mk.dir	2012-09-13 14:18:35.000000000 +0200
++++ mozilla-aurora-7676a9a06403/config/baseconfig.mk	2012-09-26 10:13:45.258240426 +0200
+@@ -2,7 +2,7 @@ INCLUDED_AUTOCONF_MK = 1
  
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+installdir	= $(libdir)/$(MOZ_APP_NAME)
- sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+ includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
+ sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+ DIST = $(DEPTH)/dist
  
- DIST		= $(DEPTH)/dist
-diff -up firefox-7.0/mozilla-beta/js/src/config/autoconf.mk.in.old firefox-7.0/mozilla-beta/js/src/config/autoconf.mk.in
---- firefox-7.0/mozilla-beta/js/src/config/autoconf.mk.in.old	2011-08-31 21:16:16.000000000 +0200
-+++ firefox-7.0/mozilla-beta/js/src/config/autoconf.mk.in	2011-09-06 12:08:39.463500899 +0200
-@@ -61,7 +61,7 @@ libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
+diff -up mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk.dir mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk
+--- mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk.dir	2012-09-13 14:18:35.000000000 +0200
++++ mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk	2012-09-26 10:14:07.353351833 +0200
+@@ -1,6 +1,6 @@
+ INCLUDED_AUTOCONF_MK = 1
  
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+installdir	= $(libdir)/$(MOZ_APP_NAME)
- sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
+ sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
  
- TOP_DIST	= @TOP_DIST@
-diff -up firefox-7.0/mozilla-beta/Makefile.in.old firefox-7.0/mozilla-beta/Makefile.in
+ ifneq (,$(filter /%,$(TOP_DIST)))
diff --git a/firefox-mozconfig b/firefox-mozconfig
index 8278b5e..b2ef22a 100644
--- a/firefox-mozconfig
+++ b/firefox-mozconfig
@@ -2,8 +2,6 @@
 
 ac_add_options --prefix="$PREFIX"
 ac_add_options --libdir="$LIBDIR"
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 #ac_add_options --with-system-png
diff --git a/firefox.spec b/firefox.spec
index b8035ea..1367b34 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -116,7 +116,7 @@ cd %{tarballdir}
 # Build patches, can't change backup suffix from default because during build
 # there is a compare of config and js/config directories and .orig suffix is 
 # ignored during this compare.
-%patch0 -p2 -b .orig
+%patch0 -p1
 
 # For branding specific patches.
 
@@ -385,7 +385,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/32x32/apps/firefox.png
 %{_datadir}/icons/hicolor/48x48/apps/firefox.png
 %{mozappdir}/xulrunner
-
+%{mozappdir}/webapprt-stub
+%dir %{mozappdir}/webapprt
+%{mozappdir}/webapprt/omni.ja
+%{mozappdir}/webapprt/webapprt.ini
 %if %{include_debuginfo}
 #%{mozappdir}/crashreporter
 %{mozappdir}/crashreporter-override.ini