[xulrunner/f15] libCurl build fix

[Martin Stransky]

commit 083b75fdc9394f3b183312e85f8e5006cbc0c791
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Fri Jun 24 11:13:01 2011 +0200

    libCurl build fix

 xulrunner-5.0-curl.patch |   44 ++++++++++++++++++++++++++++++++++++++++++++
 xulrunner.spec           |   15 ++++++++++++++-
 2 files changed, 58 insertions(+), 1 deletions(-)
---
diff --git a/xulrunner-5.0-curl.patch b/xulrunner-5.0-curl.patch
new file mode 100644
index 0000000..6d40aa5
--- /dev/null
+++ b/xulrunner-5.0-curl.patch
@@ -0,0 +1,44 @@
+diff -up xulrunner-5.0/mozilla-release/config/system-headers.old xulrunner-5.0/mozilla-release/config/system-headers
+--- xulrunner-5.0/mozilla-release/config/system-headers.old	2011-06-15 23:57:19.000000000 +0200
++++ xulrunner-5.0/mozilla-release/config/system-headers	2011-06-24 11:03:04.725787684 +0200
+@@ -207,7 +207,6 @@ ctime
+ ctype.h
+ curl/curl.h
+ curl/easy.h
+-curl/types.h
+ curses.h
+ cxxabi.h
+ DateTimeUtils.h
+diff -up xulrunner-5.0/mozilla-release/js/src/config/system-headers.old xulrunner-5.0/mozilla-release/js/src/config/system-headers
+--- xulrunner-5.0/mozilla-release/js/src/config/system-headers.old	2011-06-15 23:57:28.000000000 +0200
++++ xulrunner-5.0/mozilla-release/js/src/config/system-headers	2011-06-24 11:05:09.305688350 +0200
+@@ -207,7 +207,6 @@ ctime
+ ctype.h
+ curl/curl.h
+ curl/easy.h
+-curl/types.h
+ curses.h
+ cxxabi.h
+ DateTimeUtils.h
+diff -up xulrunner-5.0/mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc.old xulrunner-5.0/mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
+--- xulrunner-5.0/mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc.old	2011-06-15 23:57:55.000000000 +0200
++++ xulrunner-5.0/mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc	2011-06-24 11:02:26.854732204 +0200
+@@ -33,7 +33,6 @@
+ #include <dlfcn.h>
+ #include <curl/curl.h>
+ #include <curl/easy.h>
+-#include <curl/types.h>
+ 
+ namespace {
+ 
+diff -up xulrunner-5.0/mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc.old xulrunner-5.0/mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
+--- xulrunner-5.0/mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc.old	2011-06-15 23:57:55.000000000 +0200
++++ xulrunner-5.0/mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc	2011-06-24 11:02:08.801845273 +0200
+@@ -29,7 +29,6 @@
+ 
+ #include <curl/curl.h>
+ #include <curl/easy.h>
+-#include <curl/types.h>
+ #include <dlfcn.h>
+ 
+ #include <iostream>
diff --git a/xulrunner.spec b/xulrunner.spec
index 7b76d01..92daa45 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -60,7 +60,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        5.0
-Release:        2%{?pre_tag}%{?dist}
+Release:        3%{?pre_tag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -78,7 +78,12 @@ Patch9:         mozilla-build-sbrk.patch
 Patch13:        xulrunner-2.0-secondary-jit.patch
 Patch14:        xulrunner-2.0-chromium-types.patch
 Patch15:        firefox-5.0-xulstub.patch
+%if 0%{?fedora} <= 15
 Patch16:        add-gtkmozembed.patch
+%endif
+%if 0%{?fedora} > 15
+Patch17:        xulrunner-5.0-curl.patch
+%endif
 
 # Fedora specific patches
 Patch20:        mozilla-193-pkgconfig.patch
@@ -205,7 +210,12 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
 %patch13 -p2 -b .secondary-jit
 %patch14 -p2 -b .chromium-types
 %patch15 -p1 -R -b .xulstub
+%if 0%{?fedora} <= 15
 %patch16 -p2 -b .gtkmozembed
+%endif
+%if 0%{?fedora} > 15
+%patch17 -p2 -b .curl
+%endif
 
 %patch20 -p2 -b .pk
 %patch21 -p2 -b .jpeg-turbo
@@ -477,6 +487,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Jun 21 2011 Martin Stransky <stransky at redhat.com> 5.0-3
+- libCurl build fix
+
 * Wed Jun 22 2011 Martin Stransky <stransky at redhat.com> 5.0-2
 - Reverted mozbz#648156 - Remove gtkmozembed