forked from pool/MozillaThunderbird
6.0
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=121
This commit is contained in:
Wolfgang Rosenauer
Git OBS Bridge
parent
da52922890
commit
7d6266e5fa
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 12 20:40:07 UTC 2011 - wr@rosenauer.org
|
||||
|
||||
- update to version 6.0 (bnc#711954)
|
||||
* including security fixes
|
||||
- add mozilla-curl.patch to remove dependencies to obsolete curl
|
||||
header
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 30 08:30:11 CEST 2011 - jslaby@suse.de
|
||||
|
||||
|
||||
@ -20,14 +20,14 @@
|
||||
|
||||
|
||||
Name: MozillaThunderbird
|
||||
BuildRequires: Mesa-devel autoconf213 fdupes gcc-c++ hunspell-devel libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files yasm zip
|
||||
BuildRequires: autoconf213 fdupes gcc-c++ hunspell-devel libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files Mesa-devel yasm zip
|
||||
BuildRequires: mozilla-nss-devel >= 3.12.8
|
||||
BuildRequires: nss-shared-helper-devel
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
%define mainversion 5.99
|
||||
%define mainversion 6.0
|
||||
Version: %{mainversion}
|
||||
Release: 1
|
||||
%define releasedate 2011072900
|
||||
%define releasedate 2011081200
|
||||
Provides: thunderbird = %{version}
|
||||
Summary: The Stand-Alone Mozilla Mail Component
|
||||
Url: http://www.mozilla.org/products/thunderbird/
|
||||
@ -51,6 +51,7 @@ Patch3: mozilla-language.patch
|
||||
Patch4: mozilla-linux3.patch
|
||||
Patch5: mozilla-cairo-return.patch
|
||||
Patch6: mozilla-dump_syms-static.patch
|
||||
Patch7: mozilla-curl.patch
|
||||
# Thunderbird/mail
|
||||
Patch10: tb-ssldap.patch
|
||||
Patch11: tb-develdirs.patch
|
||||
@ -87,7 +88,6 @@ cross-platform. It is a stand-alone application instead of part of the
|
||||
Mozilla application suite.
|
||||
|
||||
%if %localize
|
||||
|
||||
%package translations-common
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
Summary: Common translations for MozillaThunderbird
|
||||
@ -104,7 +104,7 @@ of MozillaThunderbird.
|
||||
%package translations-other
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
Summary: Extra translations for MozillaThunderbird
|
||||
Provides: locale(%{name}:af;be;bg;bn_BD;el;et;eu;fy_NL;ga_IE;gd;gl;he;id;is;lt;nn_NO;pa_IN;ro;si;sk;sl;sq;sr;tr;uk;vi)
|
||||
Provides: locale(%{name}:be;bn_BD;br;el;et;eu;fy_NL;ga_IE;gd;gl;he;id;is;lt;nn_NO;rm;si;sk;sl;sq;ta_LK;tr;uk;vi)
|
||||
Group: System/Localization
|
||||
PreReq: %{name} = %{mainversion}
|
||||
Obsoletes: %{name}-translations < %{version}-%{release}
|
||||
@ -127,7 +127,6 @@ Software Development Kit to build plugins/extensions against Thunderbird.
|
||||
|
||||
|
||||
%if %crashreporter
|
||||
|
||||
%package buildsymbols
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
Summary: Breakpad buildsymbols for %{name}
|
||||
@ -139,7 +138,6 @@ symbols meant for upload to Mozilla's crash collector database.
|
||||
%endif
|
||||
|
||||
%if %build_enigmail
|
||||
|
||||
%package -n enigmail
|
||||
Version: 1.2.99
|
||||
Release: 1
|
||||
@ -172,6 +170,7 @@ pushd mozilla
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
popd
|
||||
# comm-central patches
|
||||
%patch10 -p1
|
||||
@ -476,7 +475,6 @@ exit 0
|
||||
%{_bindir}/%{progname}
|
||||
|
||||
%if %localize
|
||||
|
||||
%files translations-common -f %{_tmppath}/translations.common
|
||||
%defattr(-,root,root)
|
||||
|
||||
@ -493,7 +491,6 @@ exit 0
|
||||
%{_includedir}/%{progname}/
|
||||
|
||||
%if %build_enigmail
|
||||
|
||||
%files -n enigmail
|
||||
%defattr(-,root,root)
|
||||
%dir %{_libdir}/mozilla
|
||||
@ -501,7 +498,6 @@ exit 0
|
||||
%endif
|
||||
|
||||
%if %crashreporter
|
||||
|
||||
%files buildsymbols
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/mozilla/
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5ea7fc0c4be1b775b5d87c397417cb08aa054ec5ae0829845d8c4b6374344970
|
||||
size 25672
|
||||
oid sha256:2f5d7ad1f494402ef235fdd8b2f1ab1279e039de55c7c41f9b749a37b625e7f2
|
||||
size 25677
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
#!/bin/bash
|
||||
|
||||
|
||||
BRANCH="releases/comm-beta"
|
||||
RELEASE_TAG="THUNDERBIRD_6_0b2_RELEASE"
|
||||
VERSION="5.99"
|
||||
BRANCH="releases/comm-release"
|
||||
RELEASE_TAG="THUNDERBIRD_6_0_RELEASE"
|
||||
VERSION="6.0"
|
||||
|
||||
echo "cloning $BRANCH..."
|
||||
hg clone http://hg.mozilla.org/$BRANCH thunderbird
|
||||
@ -12,7 +12,7 @@ hg update -r $RELEASE_TAG
|
||||
echo "running client.py..."
|
||||
[ "$RELEASE_TAG" == "default" ] || _extra="--comm-rev=$RELEASE_TAG --mozilla-rev=$RELEASE_TAG"
|
||||
# temporary!
|
||||
_extra="--mozilla-repo=http://hg.mozilla.org/releases/mozilla-beta $_extra"
|
||||
_extra="--mozilla-repo=http://hg.mozilla.org/releases/mozilla-release $_extra"
|
||||
python client.py checkout --skip-chatzilla --skip-venkman $_extra
|
||||
popd
|
||||
echo "creating archive..."
|
||||
@ -33,7 +33,7 @@ for locale in $(awk '{ print $1; }' $SHIPPED_LOCALES); do
|
||||
;;
|
||||
*)
|
||||
echo "fetching $locale ..."
|
||||
hg clone http://hg.mozilla.org/releases/l10n/mozilla-beta/$locale l10n/$locale
|
||||
hg clone http://hg.mozilla.org/releases/l10n/mozilla-release/$locale l10n/$locale
|
||||
hg -R l10n/$locale up -C -r $RELEASE_TAG
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f9dd8eb3d3636deef0372f9cd0698fefdee66530a59bd6cd0842ab7a240adeda
|
||||
size 24045276
|
||||
3
l10n-6.0.tar.bz2
Normal file
3
l10n-6.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c6bb48c67c83640f60816b8d38c0a2a1dc97fae16e592234a71e338f21ccbb5f
|
||||
size 24044189
|
||||
89
mozilla-curl.patch
Normal file
89
mozilla-curl.patch
Normal file
@ -0,0 +1,89 @@
|
||||
# HG changeset patch
|
||||
# User Evan Shaw <edsrzf@gmail.com>
|
||||
# Parent 891179411e19ab39f95bd7769c0e58db6f22f9e4
|
||||
bug 673072 - remove deprecated curl header curl/types.h from Breakpad includes. r=ted
|
||||
|
||||
diff --git a/config/system-headers b/config/system-headers
|
||||
--- a/config/system-headers
|
||||
+++ b/config/system-headers
|
||||
@@ -199,17 +199,16 @@ crypt.h
|
||||
cstddef
|
||||
cstdio
|
||||
cstdlib
|
||||
cstring
|
||||
ctime
|
||||
ctype.h
|
||||
curl/curl.h
|
||||
curl/easy.h
|
||||
-curl/types.h
|
||||
curses.h
|
||||
cxxabi.h
|
||||
DateTimeUtils.h
|
||||
dbus/dbus.h
|
||||
dbus/dbus-glib.h
|
||||
dbus/dbus-glib-lowlevel.h
|
||||
ddeml.h
|
||||
Debug.h
|
||||
diff --git a/js/src/config/system-headers b/js/src/config/system-headers
|
||||
--- a/js/src/config/system-headers
|
||||
+++ b/js/src/config/system-headers
|
||||
@@ -199,17 +199,16 @@ crypt.h
|
||||
cstddef
|
||||
cstdio
|
||||
cstdlib
|
||||
cstring
|
||||
ctime
|
||||
ctype.h
|
||||
curl/curl.h
|
||||
curl/easy.h
|
||||
-curl/types.h
|
||||
curses.h
|
||||
cxxabi.h
|
||||
DateTimeUtils.h
|
||||
dbus/dbus.h
|
||||
dbus/dbus-glib.h
|
||||
dbus/dbus-glib-lowlevel.h
|
||||
ddeml.h
|
||||
Debug.h
|
||||
diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
|
||||
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
|
||||
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
|
||||
@@ -28,17 +28,16 @@
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include "common/linux/http_upload.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include <dlfcn.h>
|
||||
#include <curl/curl.h>
|
||||
#include <curl/easy.h>
|
||||
-#include <curl/types.h>
|
||||
|
||||
namespace {
|
||||
|
||||
// Callback to get the response data from server.
|
||||
static size_t WriteCallback(void *ptr, size_t size,
|
||||
size_t nmemb, void *userp) {
|
||||
if (!userp)
|
||||
return 0;
|
||||
diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
|
||||
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
|
||||
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
|
||||
@@ -24,17 +24,16 @@
|
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include <curl/curl.h>
|
||||
#include <curl/easy.h>
|
||||
-#include <curl/types.h>
|
||||
#include <dlfcn.h>
|
||||
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
|
||||
#include "common/linux/libcurl_wrapper.h"
|
||||
|
||||
using std::string;
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:87f435db99769bf3bdcc92b28edb3141d7029f9f0e0e2d2ac1bbda37e980c435
|
||||
size 85939079
|
||||
3
thunderbird-6.0-source.tar.bz2
Normal file
3
thunderbird-6.0-source.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8ff8783a7b6f501b4c9082e8413893fbeebdf183cd4836f68517a940a556605b
|
||||
size 85936932
|
||||
Loading…
Reference in New Issue
Block a user