summaryrefslogtreecommitdiffstats
path: root/thunderbird-enigmail.spec
diff options
context:
space:
mode:
Diffstat (limited to 'thunderbird-enigmail.spec')
-rw-r--r--thunderbird-enigmail.spec36
1 files changed, 15 insertions, 21 deletions
diff --git a/thunderbird-enigmail.spec b/thunderbird-enigmail.spec
index fdc0d70..449abf2 100644
--- a/thunderbird-enigmail.spec
+++ b/thunderbird-enigmail.spec
@@ -31,11 +31,12 @@
%define sqlite_version 3.7.10
%define libnotify_version 0.4
%global libvpx_version 1.0.0
+%define _default_patch_fuzz 2
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
-%global thunver 12.0
-%global thunmax 13.0
+%global thunver 13.0
+%global thunmax 14.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -53,7 +54,7 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.4.1
+Version: 1.4.2
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
@@ -86,15 +87,12 @@ Patch7: crashreporter-remove-static.patch
Patch8: xulrunner-10.0-secondary-ipc.patch
# Build patches
-Patch102: mozilla-733867-x.patch
-Patch103: mozilla-file.patch
Patch104: xulrunner-10.0-gcc47.patch
+Patch105: xulrunner-prtime.patch
+
# Linux specific
Patch200: thunderbird-8.0-enable-addons.patch
-# ARM Specific
-Patch210: mozilla-724615.patch
-
# Enigmail patch
@@ -106,11 +104,11 @@ Patch210: mozilla-724615.patch
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{system_nspr}
BuildRequires: nspr-devel >= %{nspr_version}
%endif
%if %{system_nss}
+BuildRequires: nss-static
BuildRequires: nss-devel >= %{nss_version}
%endif
%if %{system_cairo}
@@ -182,13 +180,11 @@ cd %{tarballdir}
cd mozilla
%patch7 -p2 -b .static
%patch8 -p3 -b .secondary-ipc
-%patch103 -p1 -b .mozilla-file
%patch104 -p1 -b .gcc47
+%patch105 -p1 -b .prtime
cd ..
-%patch102 -p1 -b .733867
%patch200 -p1 -b .addons
-%patch210 -p1 -b .724615
%if %{official_branding}
# Required by Mozilla Corporation
@@ -311,34 +307,32 @@ make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
# ===== Enigmail work =====
pushd mailnews/extensions/enigmail
./makemake -r
+popd
+
+pushd objdir/mailnews/extensions/enigmail
make
make xpi
popd
-
#===============================================================================
%install
cd %{tarballdir}
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{enigmail_extname}
-
-unzip -q mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+unzip -q objdir/mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname}
%files
-%defattr(-,root,root,-)
%{enigmail_extname}
#===============================================================================
%changelog
+* Tue Jun 05 2012 Remi Collet <remi@fedoraproject.org> 1.4.2-1
+- Enigmail 1.4.2 for Thunderbird 13.0
+
* Sat Apr 28 2012 Remi Collet <remi@fedoraproject.org> 1.4.1-1
- Enigmail 1.4.1 for Thunderbird 12.0