[xulrunner/f16] build fixes

[Martin Stransky]

commit 18ce54b15db648c3dfa920a0e6081eb5d1d0e093
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Tue Oct 9 11:50:05 2012 +0200

    build fixes

 xulrunner-install-dir.patch |   23 +++++++++++++++++++++++
 xulrunner-version.patch     |   13 -------------
 xulrunner.spec              |   11 ++++-------
 3 files changed, 27 insertions(+), 20 deletions(-)
---
diff --git a/xulrunner-install-dir.patch b/xulrunner-install-dir.patch
new file mode 100644
index 0000000..e788fa0
--- /dev/null
+++ b/xulrunner-install-dir.patch
@@ -0,0 +1,23 @@
+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
+ 
+ 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
+ 
+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)
+ 
+ ifneq (,$(filter /%,$(TOP_DIST)))
diff --git a/xulrunner.spec b/xulrunner.spec
index 3e861cc..b04a358 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -35,12 +35,12 @@
 # alpha_version should be set to the alpha number if using an alpha, 0 otherwise
 # beta_version  should be set to the beta number if using a beta, 0 otherwise
 # rc_version    should be set to the RC number if using an RC, 0 otherwise
-%global gecko_dir_ver 2
+%global gecko_dir_ver %{version}
 %global alpha_version 0
 %global beta_version  0
 %global rc_version    0
 
-%global mozappdir     %{_libdir}/%{name}-%{gecko_dir_ver}
+%global mozappdir     %{_libdir}/%{name}
 %global tarballdir    mozilla-release
 
 # crash reporter work only on x86/x86_64
@@ -84,8 +84,8 @@ Source12:       %{name}-redhat-default-prefs.js
 Source21:       %{name}.sh.in
 
 # build patches
-Patch0:         xulrunner-version.patch
 Patch1:         mozilla-build.patch
+Patch2:         xulrunner-install-dir.patch
 Patch14:        xulrunner-2.0-chromium-types.patch
 Patch17:        xulrunner-15.0-gcc47.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3
@@ -219,11 +219,8 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 %setup -q -c
 cd %{tarballdir}
 
-sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
-    > version.patch
-%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
-
 %patch1  -p1 -b .build
+%patch2  -p1
 %patch14 -p1 -b .chromium-types
 %patch17 -p2 -b .gcc47
 %patch18 -p2 -b .jemalloc-ppc