From db13379b32f57a27bf25bf5f311c07701821c8727587912e68022721d2127090 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Sat, 12 Oct 2013 20:10:48 +0000 Subject: [PATCH] - update to Thunderbird 24.0.1 * fqdn for smtp server name was not accepted (bmo#913785) * fixed crash in PL_strncasecmp (bmo#917955) - update Enigmail to 1.6 * The passphrase timeout configuration in Enigmail is now read and written from/to gpg-agent. * New dialog to change the expiry date of keys * New function to search for the OpenPGP keys of all Address Book entries on a keyserver * removed obsolete enigmail-build.patch OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=227 --- MozillaThunderbird.changes | 14 ++++++++++++ MozillaThunderbird.spec | 24 ++++++++------------ _constraints | 2 +- compare-locales.tar.bz2 | 4 ++-- create-tar.sh | 4 ++-- enigmail-1.5.2.tar.gz | 3 --- enigmail-1.6.tar.gz | 3 +++ enigmail-build.patch | 37 ------------------------------- l10n-24.0.1.tar.bz2 | 3 +++ l10n-24.0.tar.bz2 | 3 --- thunderbird-24.0-source.tar.bz2 | 3 --- thunderbird-24.0.1-source.tar.bz2 | 3 +++ 12 files changed, 37 insertions(+), 66 deletions(-) delete mode 100644 enigmail-1.5.2.tar.gz create mode 100644 enigmail-1.6.tar.gz delete mode 100644 enigmail-build.patch create mode 100644 l10n-24.0.1.tar.bz2 delete mode 100644 l10n-24.0.tar.bz2 delete mode 100644 thunderbird-24.0-source.tar.bz2 create mode 100644 thunderbird-24.0.1-source.tar.bz2 diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 30659ea..edd2307 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Oct 10 14:43:22 UTC 2013 - wr@rosenauer.org + +- update to Thunderbird 24.0.1 + * fqdn for smtp server name was not accepted (bmo#913785) + * fixed crash in PL_strncasecmp (bmo#917955) +- update Enigmail to 1.6 + * The passphrase timeout configuration in Enigmail is now read and + written from/to gpg-agent. + * New dialog to change the expiry date of keys + * New function to search for the OpenPGP keys of all Address Book + entries on a keyserver + * removed obsolete enigmail-build.patch + ------------------------------------------------------------------- Sat Sep 14 20:32:28 UTC 2013 - wr@rosenauer.org diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 0a0ebea..c5803d9 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -17,9 +17,10 @@ # -%define with_kde 1 - +%define mainversion 24.0.1 +%define update_channel release %define gstreamer_ver 0.10 +%define with_kde 1 Name: MozillaThunderbird BuildRequires: Mesa-devel @@ -47,11 +48,9 @@ BuildRequires: pkgconfig(gstreamer-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-app-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver) %endif -%define mainversion 24.0 -%define update_channel release Version: %{mainversion} Release: 0 -%define releasedate 2013091200 +%define releasedate 2013101000 Provides: thunderbird = %{version} %if %{with_kde} # this is needed to match this package with the kde4 helper package without the main package @@ -72,7 +71,7 @@ Source4: l10n-%{version}.tar.bz2 Source6: suse-default-prefs.js Source7: find-external-requires.sh Source8: thunderbird-rpmlintrc -Source9: enigmail-1.5.2.tar.gz +Source9: enigmail-1.6.tar.gz Source10: create-tar.sh Source11: compare-locales.tar.bz2 Source12: kde.js @@ -87,8 +86,6 @@ Patch7: mozilla-ppc.patch Patch20: tb-ssldap.patch Patch21: tb-develdirs.patch Patch22: thunderbird-shared-nss-db.patch -# Enigmail -Patch30: enigmail-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils fileutils textutils /bin/sh Recommends: libcanberra0 @@ -178,7 +175,7 @@ symbols meant for upload to Mozilla's crash collector database. %if %build_enigmail %package -n enigmail -Version: 1.5.2+%{mainversion} +Version: 1.6.0+%{mainversion} Release: 0 Summary: OpenPGP addon for Thunderbird and SeaMonkey License: MPL-1.1 or GPL-2.0+ @@ -217,12 +214,6 @@ popd %patch20 -p1 %patch21 -p1 %patch22 -p1 -%if %build_enigmail -# enigmail -pushd $RPM_BUILD_DIR/enigmail -%patch30 -p1 -popd -%endif %build # no need to add build time to binaries @@ -242,6 +233,9 @@ export SUSE_ASNEEDED=0 export MOZ_BUILD_DATE=%{releasedate} export MOZILLA_OFFICIAL=1 export BUILD_OFFICIAL=1 +%if %{update_channel} == "esr" +export MOZ_ESR=1 +%endif export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing" %ifarch ppc64 export CFLAGS="$CFLAGS -mminimal-toc" diff --git a/_constraints b/_constraints index c510e01..10b0e57 100644 --- a/_constraints +++ b/_constraints @@ -5,7 +5,7 @@ 9 - 3500 + 3000 diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2 index d516639..e8415d6 100644 --- a/compare-locales.tar.bz2 +++ b/compare-locales.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:974a49bccf5a58915935a55714975dd519cb668fd76b5907b3a49964afcc72cc -size 29942 +oid sha256:02a2655e062dff2649d2a3742de577a5a1e7ab0d68481b3c92403ae500c72edc +size 29906 diff --git a/create-tar.sh b/create-tar.sh index ed12d4a..d05215e 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -2,8 +2,8 @@ CHANNEL="esr24" BRANCH="releases/comm-$CHANNEL" -RELEASE_TAG="THUNDERBIRD_24_0_RELEASE" -VERSION="24.0" +RELEASE_TAG="THUNDERBIRD_24_0_1_RELEASE" +VERSION="24.0.1" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH thunderbird diff --git a/enigmail-1.5.2.tar.gz b/enigmail-1.5.2.tar.gz deleted file mode 100644 index 8d91e28..0000000 --- a/enigmail-1.5.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f20d6d1be1ab12dc2f1208d8f01227fd7e5c4dcf5d6f4bd0833a932b58973a26 -size 1211395 diff --git a/enigmail-1.6.tar.gz b/enigmail-1.6.tar.gz new file mode 100644 index 0000000..ece39b8 --- /dev/null +++ b/enigmail-1.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10d5eb7ba364b9b6e6275aae8bba1d0e4321ed7d55a715337d566ccf2a56ea4d +size 1231111 diff --git a/enigmail-build.patch b/enigmail-build.patch deleted file mode 100644 index e1a9c37..0000000 --- a/enigmail-build.patch +++ /dev/null @@ -1,37 +0,0 @@ -Subject: Enigmail breaks Thunderbird packaging -Reference: -https://bug886095.bugzilla.mozilla.org/attachment.cgi?id=773916 - -diff --git a/genxpi b/genxpi ---- a/genxpi -+++ b/genxpi -@@ -73,16 +73,17 @@ if [ ${platform} = OS2_x86-gcc3 ]; then - enigDllFile=platform/${platform}/components/${enigmimeDll} - else - enigDllFile=platform/${platform}/components/${libPrefix}enigmime-${xpcomAbi}${dllSuffix} - fi - - subprocessDll=${libPrefix}subprocess${dllSuffix} - spDllFile=platform/${platform}/lib/${libPrefix}subprocess-${xpcomAbi}${dllSuffix} - -+cp ${targetDir}/chrome.manifest{,.save} - # Prepare chrome.manifest - cat ${srcDir}/package/chrome.manifest | \ - sed 's/##ENIGMIMEDLL-PLACEHOLDER##/binary-component platform\/'${platform}'\/components\/'`basename ${enigDllFile}`' ABI='${platform}'/' \ - > ${targetDir}/chrome.manifest - - # Prepare languages other than en-US - - if [ -s ${srcDir}/lang/current-languages.txt ]; then -@@ -146,9 +147,10 @@ zip ${xpiFile} \ - chrome/${xpiModule}.jar \ - ${localeJar} \ - components/enigmime.xpt \ - ${enigDllFile} \ - ${spDllFile} \ - chrome.manifest \ - install.rdf - --rm install.rdf chrome.manifest -+rm install.rdf -+mv chrome.manifest{.save,} diff --git a/l10n-24.0.1.tar.bz2 b/l10n-24.0.1.tar.bz2 new file mode 100644 index 0000000..f1b7356 --- /dev/null +++ b/l10n-24.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:762a4c5d0233f816eeab2969f6f95294b13dfc9573fcd77df688dd7aaebc81aa +size 27937701 diff --git a/l10n-24.0.tar.bz2 b/l10n-24.0.tar.bz2 deleted file mode 100644 index cdc3721..0000000 --- a/l10n-24.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b02fe5a6f487c932fa6912ee99e9da4b43440728dad29de3e2e93ef75ad88a30 -size 27945426 diff --git a/thunderbird-24.0-source.tar.bz2 b/thunderbird-24.0-source.tar.bz2 deleted file mode 100644 index e355bc4..0000000 --- a/thunderbird-24.0-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:209a6e9e1c2a0cccc8e9582db43c1c8125ffa6623517e91e51606683adc951c3 -size 142363452 diff --git a/thunderbird-24.0.1-source.tar.bz2 b/thunderbird-24.0.1-source.tar.bz2 new file mode 100644 index 0000000..5d69ae3 --- /dev/null +++ b/thunderbird-24.0.1-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:439505840f9775c090927051616e77c61aaf8c0ae8145643c6e6114166dc5078 +size 142430472