forked from pool/MozillaThunderbird
fix build
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=114
This commit is contained in:
Wolfgang Rosenauer
Git OBS Bridge
parent
8d8ccb8520
commit
b96abe621f
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 20 09:36:22 UTC 2011 - wr@rosenauer.org
|
||||
|
||||
- security update to version 3.1.11
|
||||
- speed up find-external-requires.sh
|
||||
- do not build dump_syms static as it is not needed for us
|
||||
-> fixes build for 12.1 and above
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 15 06:24:16 UTC 2011 - wr@rosenauer.org
|
||||
|
||||
|
||||
@ -26,10 +26,10 @@ BuildRequires: mozilla-nss-devel >= 3.12.8
|
||||
BuildRequires: nss-shared-helper-devel
|
||||
%endif
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
%define mainversion 3.1.10
|
||||
%define mainversion 3.1.11
|
||||
Version: %{mainversion}
|
||||
Release: 1
|
||||
%define releasedate 2011041400
|
||||
%define releasedate 2011061600
|
||||
Provides: thunderbird = %{version}
|
||||
Summary: The Stand-Alone Mozilla Mail Component
|
||||
Url: http://www.mozilla.org/products/thunderbird/
|
||||
@ -45,6 +45,7 @@ Source7: find-external-requires.sh
|
||||
Source8: MozillaThunderbird-rpmlintrc
|
||||
Source9: enigmail-1.1.2.tar.bz2
|
||||
Source10: create-tar.sh
|
||||
Patch1: mozilla-dump_syms-static.patch
|
||||
Patch2: thunderbird-appname.patch
|
||||
Patch4: tb-ssldap.patch
|
||||
Patch5: tb-develdirs.patch
|
||||
@ -140,7 +141,7 @@ symbols meant for upload to Mozilla's crash collector database.
|
||||
|
||||
%package -n enigmail
|
||||
Version: 1.1.2
|
||||
Release: 11
|
||||
Release: 7
|
||||
License: MPLv1.1 or GPLv2+
|
||||
Summary: OpenPGP addon for Thunderbird and SeaMonkey
|
||||
Group: Productivity/Networking/Email/Clients
|
||||
@ -164,6 +165,7 @@ This package contains the Enigmail OpenPGP Addon for Thunderbird and SeaMonkey.
|
||||
%endif
|
||||
# xulrunner patches
|
||||
pushd mozilla
|
||||
%patch1 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch13 -p1
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
|
||||
BRANCH="releases/comm-1.9.2" # comm-central
|
||||
RELEASE_TAG="THUNDERBIRD_3_1_10_RELEASE"
|
||||
VERSION="3.1.10"
|
||||
RELEASE_TAG="THUNDERBIRD_3_1_11_RELEASE"
|
||||
VERSION="3.1.11"
|
||||
|
||||
echo "cloning $BRANCH..."
|
||||
hg clone http://hg.mozilla.org/$BRANCH thunderbird
|
||||
|
||||
@ -1,23 +1,9 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Finds requirements provided outside of the current file set
|
||||
|
||||
filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"`
|
||||
|
||||
provides=`echo "$filelist" | /usr/lib/rpm/find-provides`
|
||||
|
||||
{
|
||||
for f in $filelist ; do
|
||||
echo $f | /usr/lib/rpm/find-requires | while read req ; do
|
||||
found=0
|
||||
for p in $provides ; do
|
||||
if [ "$req" = "$p" ]; then
|
||||
found=1
|
||||
fi
|
||||
done
|
||||
if [ "$found" = "0" ]; then
|
||||
echo $req
|
||||
fi
|
||||
done
|
||||
done
|
||||
} | sort -u
|
||||
filelist=$( sed "s/[]['\"*?{}]/\\\\\&/g" )
|
||||
provides=$( echo "$filelist" | /usr/lib/rpm/find-provides )
|
||||
echo "$filelist" \
|
||||
| /usr/lib/rpm/find-requires \
|
||||
| grep -F -v "$provides" \
|
||||
| sort -u
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3b9509c0486993617c46188aa92db86b4f347480554b08306f27e9ddc0ba3343
|
||||
size 20473334
|
||||
3
l10n-3.1.11.tar.bz2
Normal file
3
l10n-3.1.11.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c21aa265252f3f37cebb5b62c9262aa1ae097e25a90ef0c31111da1bfc7b77aa
|
||||
size 20472893
|
||||
20
mozilla-dump_syms-static.patch
Normal file
20
mozilla-dump_syms-static.patch
Normal file
@ -0,0 +1,20 @@
|
||||
# HG changeset patch
|
||||
# Parent e589abb2c4d6aaa6083d254416211ac90360dbdd
|
||||
NO-BUG: Ignore a hack which is not needed in distribution build environments.
|
||||
|
||||
diff --git a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
|
||||
--- a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
|
||||
+++ b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
|
||||
@@ -59,11 +59,11 @@ HOST_LIBS += \
|
||||
$(NULL)
|
||||
|
||||
# force C++ linking
|
||||
CPP_PROG_LINK = 1
|
||||
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
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5807689fac6e961f52e22fd3b0c8cc3c36309ec46893f3b785b506797cdc5646
|
||||
size 68645676
|
||||
3
thunderbird-3.1.11-source.tar.bz2
Normal file
3
thunderbird-3.1.11-source.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5a9985c450b6a2f5b8aa7ae137c9e2f2ad3c1b3a111a72b16127a9e015e675c3
|
||||
size 68643272
|
||||
Loading…
Reference in New Issue
Block a user