[xulrunner] Fixed Makefile generator (rhbz#304121)

[Martin Stransky]

commit b0f532378190f377576dbd3cefab2da8366df592
Author: Martin Stransky <stransky at redhat.com>
Date:   Thu Jan 10 14:59:37 2013 +0100

    Fixed Makefile generator (rhbz#304121)

 rhbz-304121.patch |   13 +++++++++++++
 rhbz-872752.patch |   38 --------------------------------------
 xulrunner.spec    |   12 ++++++++----
 3 files changed, 21 insertions(+), 42 deletions(-)
---
diff --git a/rhbz-304121.patch b/rhbz-304121.patch
new file mode 100644
index 0000000..941aca2
--- /dev/null
+++ b/rhbz-304121.patch
@@ -0,0 +1,13 @@
+diff -up firefox-18.0/mozilla-release/media/webrtc/trunk/Makefile.old firefox-18.0/mozilla-release/media/webrtc/trunk/Makefile
+diff -up firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.old firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
+--- firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.old	2013-01-05 00:44:41.000000000 +0100
++++ firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py	2013-01-10 14:48:58.418321640 +0100
+@@ -376,7 +376,7 @@ class MakefileGenerator(object):
+     WriteMakefile(output_file, data, build_file, depth, top,
+                   # we set srcdir up one directory, since the subdir
+                   # doesn't actually exist in the source directory
+-                  swapslashes(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0])),
++                  swapslashes(os.path.normpath(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0]))),
+                   self.relative_srcdir)
+     return True
+ 
diff --git a/xulrunner.spec b/xulrunner.spec
index 9928674..ecc5baf 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -75,7 +75,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        18.0
-Release:        6%{?pre_tag}%{?dist}
+Release:        7%{?pre_tag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -92,6 +92,7 @@ Patch14:        xulrunner-2.0-chromium-types.patch
 Patch17:        xulrunner-15.0-gcc47.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3
 Patch18:        xulrunner-16.0-jemalloc-ppc.patch
+Patch19:        rhbz-304121.patch
 
 # Fedora specific patches
 Patch20:        mozilla-193-pkgconfig.patch
@@ -224,6 +225,7 @@ cd %{tarballdir}
 %patch14 -p2 -b .chromium-types
 %patch17 -p2 -b .gcc47
 %patch18 -p2 -b .jemalloc-ppc
+%patch19 -p2 -b .rhbz-304121
 
 %patch20  -p2 -b .pk
 %patch100 -p1 -R -b .restartless-lang
@@ -292,10 +294,9 @@ echo "ac_add_options --disable-polyic" >> .mozconfig
 echo "ac_add_options --disable-tracejit" >> .mozconfig
 %endif
 
-# Disable WebRTC because of Bug 304121
-#%ifnarch %{ix86} x86_64
+%ifnarch %{ix86} x86_64
 echo "ac_add_options --disable-webrtc" >> .mozconfig
-#%endif
+%endif
 
 #---------------------------------------------------------------------
 
@@ -507,6 +508,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Jan 10 2013 Martin Stransky <stransky at redhat.com> - 18.0-7
+- Fixed Makefile generator (rhbz#304121)
+
 * Wed Jan 9 2013 Martin Stransky <stransky at redhat.com> - 18.0-6
 - Fixed missing libxpcom.so provides