rpms/thunderbird/devel xulrunner-elif.patch, NONE, 1.1 thunderbird-mozconfig, 1.12, 1.13 thunderbird.spec, 1.125, 1.126

[Jan Horak]

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1551

Modified Files:
	thunderbird-mozconfig thunderbird.spec 
Added Files:
	xulrunner-elif.patch 
Log Message:
Trying to build on rawhide

xulrunner-elif.patch:

--- NEW FILE xulrunner-elif.patch ---
diff -up mozilla/toolkit/xre/nsAppRunner.cpp.old mozilla/toolkit/xre/nsAppRunner.cpp
--- mozilla/toolkit/xre/nsAppRunner.cpp.old	2008-12-10 20:07:01.000000000 +0100
+++ mozilla/toolkit/xre/nsAppRunner.cpp	2009-02-27 17:17:59.000000000 +0100
@@ -1475,7 +1475,7 @@ XRE_GetBinaryPath(const char* argv0, nsI
   if (NS_FAILED(rv))
     return rv;
 
-#elif
+#else
 #error Oops, you need platform-specific code here
 #endif
 


Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird-mozconfig,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- thunderbird-mozconfig	2 Mar 2009 14:23:59 -0000	1.12
+++ thunderbird-mozconfig	3 Mar 2009 10:29:37 -0000	1.13
@@ -1,7 +1,7 @@
 mk_add_options MOZ_CO_PROJECT=mail
 ac_add_options --enable-application=mail
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb/
-mk_add_options AUTOCONF=autoconf
+mk_add_options AUTOCONF=autoconf-2.13
 
 #ac_add_options --with-system-png
 


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- thunderbird.spec	2 Mar 2009 14:35:49 -0000	1.125
+++ thunderbird.spec	3 Mar 2009 10:29:37 -0000	1.126
@@ -2,6 +2,7 @@
 %define nspr_version 4.6
 %define nss_version 3.10
 %define cairo_version 1.0
+%define dbus_glib_version 0.6
 %define autoconf_version 2.13
 
 %define official_branding 1
@@ -31,6 +32,7 @@
 
 Patch1:         mozilla-jemalloc.patch
 Patch2:         thunderbird-shared-error.patch
+Patch3:         xulrunner-elif.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -49,15 +51,19 @@
 %if 0%{?rhel} >= 5
 Requires:       launchmail
 %endif
-BuildRequires:  autoconf = %{autoconf_version}
+BuildRequires:  autoconf213 >= %{autoconf_version}
+BuildRequires:  alsa-lib-devel
+BuildRequires:  libcurl-devel
 BuildRequires:  cairo-devel >= %{cairo_version}
+BuildRequires:  dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires:  libpng-devel, libjpeg-devel, gtk2-devel
 BuildRequires:  zlib-devel, gzip, zip, unzip
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
 BuildRequires:  libIDL-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  freetype-devel
+BuildRequires:  pango-devel >= 1.22
+BuildRequires:  freetype-devel >= 2.1.9
 BuildRequires:  libXt-devel
 BuildRequires:  libXrender-devel
 Requires:       desktop-file-utils >= %{desktop_file_utils_version}
@@ -79,6 +85,7 @@
 
 %patch1 -p0 -b .jemalloc
 %patch2 -p1 -b .shared-error
+%patch3 -p0 -b .xulrunner-elif
 
 %if %{official_branding}
 # Required by Mozilla Corporation