[thunderbird] Added libnotify patch
Jan Horak
xhorak at fedoraproject.org
Mon Nov 8 11:39:17 UTC 2010
commit 437cdf535bdafec5555a202eff3f61c9f1f68224
Author: Jan Horak <jhorak at redhat.com>
Date: Mon Nov 8 12:38:46 2010 +0100
Added libnotify patch
crashreporter-remove-static.patch | 11 +++++++++++
thunderbird.spec | 16 +++++++++++-----
2 files changed, 22 insertions(+), 5 deletions(-)
---
diff --git a/crashreporter-remove-static.patch b/crashreporter-remove-static.patch
new file mode 100644
index 0000000..9cc94fb
--- /dev/null
+++ b/crashreporter-remove-static.patch
@@ -0,0 +1,11 @@
+diff -up comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
+--- comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static 2010-06-23 19:47:11.000000000 +0200
++++ comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in 2010-07-12 15:51:41.000000000 +0200
+@@ -64,6 +64,6 @@ FORCE_USE_PIC = 1
+
+ #XXX: bug 554854 causes us to be unable to run binaries on the build slaves
+ # due to them having an older libstdc++
+-HOST_LDFLAGS += -static
++#HOST_LDFLAGS += -static
+
+ include $(topsrcdir)/config/rules.mk
diff --git a/thunderbird.spec b/thunderbird.spec
index 1ed1644..1fcd251 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -29,7 +29,7 @@
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 3.1.6
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -68,11 +68,13 @@ Patch1: mozilla-jemalloc.patch
Patch2: thunderbird-shared-error.patch
# Fixes gcc complain that nsFrame::delete is protected
Patch4: xulrunner-1.9.2.1-build.patch
-# Fix missing includes for crash reporter, remove in 3.1 final
-
Patch6: mozilla-libjpeg-turbo.patch
Patch7: mozilla-missing-cflags.patch
Patch8: mozilla-build-s390.patch
+# Remove static build option from crashreporter to remove dependency on static libraries
+Patch9: crashreporter-remove-static.patch
+Patch10 mozilla-notify.patch
+
%if %{official_branding}
# Required by Mozilla Corporation
@@ -108,8 +110,6 @@ BuildRequires: alsa-lib-devel
BuildRequires: autoconf213
BuildRequires: desktop-file-utils
BuildRequires: libcurl-devel
-BuildRequires: glibc-static
-BuildRequires: libstdc++-static
Requires: mozilla-filesystem
Requires: nspr >= %{nspr_version}
Requires: nss >= %{nss_version}
@@ -158,6 +158,8 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
%ifarch s390
%patch8 -p0 -b .s390
%endif
+%patch9 -p1 -b .static
+%patch10 -p1 -b .libnotify
%if %{official_branding}
@@ -442,6 +444,10 @@ fi
#===============================================================================
%changelog
+* Mon Nov 8 2010 Jan Horak <jhorak at redhat.com> - 3.1.6-3
+- Added libnotify patch
+- Removed dependency on static libraries
+
* Fri Oct 29 2010 Jan Horak <jhorak at redhat.com> - 3.1.6-2
- Move thunderbird-lightning extension from Sunbird package to Thunderbird
More information about the scm-commits
mailing list