diff options
| -rw-r--r-- | crashreporter-remove-static.patch | 13 | ||||
| -rw-r--r-- | thunderbird-enigmail.spec | 13 |
2 files changed, 7 insertions, 19 deletions
diff --git a/crashreporter-remove-static.patch b/crashreporter-remove-static.patch deleted file mode 100644 index 330ab1a..0000000 --- a/crashreporter-remove-static.patch +++ /dev/null @@ -1,13 +0,0 @@ -Remove static build option from crashreporter to remove dependency on static libraries - -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-enigmail.spec b/thunderbird-enigmail.spec index dd52270..a3cc226 100644 --- a/thunderbird-enigmail.spec +++ b/thunderbird-enigmail.spec @@ -6,7 +6,7 @@ %else %define system_sqlite 1 %endif -%if 0%{?fedora} < 17 +%if 0%{?fedora} < 15 && 0%{?rhel} < 6 %define system_nspr 0 %define system_nss 0 %else @@ -35,8 +35,8 @@ %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} -%global thunver 14.0 -%global thunmax 15.0 +%global thunver 15.0 +%global thunmax 16.0 # The tarball is pretty inconsistent with directory structure. # Sometimes there is a top level directory. That goes here. @@ -58,7 +58,7 @@ Version: 1.4.4 %if 0%{?prever:1} Release: 0.1.%{prever}%{?dist} %else -Release: 1%{?dist} +Release: 2%{?dist} %endif URL: http://enigmail.mozdev.org/ License: MPLv1.1 or GPLv2+ @@ -83,7 +83,6 @@ Source100: http://www.mozilla-enigmail.org/download/source/enigmail-%{versi # Mozilla (XULRunner) patches Patch0: thunderbird-install-dir.patch -Patch7: crashreporter-remove-static.patch Patch8: xulrunner-10.0-secondary-ipc.patch # Build patches @@ -177,7 +176,6 @@ cd %{tarballdir} %patch0 -p2 -b .dir # Mozilla (XULRunner) patches cd mozilla -%patch7 -p2 -b .static %patch8 -p3 -b .secondary-ipc %patch104 -p1 -b .gcc47 cd .. @@ -328,6 +326,9 @@ unzip -q objdir/mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enig #=============================================================================== %changelog +* Mon Aug 27 2012 Remi Collet <remi@fedoraproject.org> 1.4.4-2 +- Enigmail 1.4.4 for Thunderbird 15.0 + * Wed Aug 21 2012 Remi Collet <remi@fedoraproject.org> 1.4.4-1 - Enigmail 1.4.4 for Thunderbird 14.0 |