Author: glen Date: Mon Feb 26 13:38:47 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- add -install.patch (install speedup by avoiding double copying)
---- Files affected:
SPECS:
mozilla-thunderbird.spec (1.83 -> 1.84)
---- Diffs:
================================================================
Index: SPECS/mozilla-thunderbird.spec
diff -u SPECS/mozilla-thunderbird.spec:1.83 SPECS/mozilla-thunderbird.spec:1.84
--- SPECS/mozilla-thunderbird.spec:1.83 Mon Feb 26 14:25:16 2007
+++ SPECS/mozilla-thunderbird.spec Mon Feb 26 14:38:42 2007
@@ -2,19 +2,20 @@
# TODO:
# - CHECK all features of enigmail
# - separate pkg for enigmail
-# - merge changes from [EMAIL PROTECTED]
+# - merge changes from mozilla-firefox
#
# Conditional builds
%bcond_without enigmail # don't build enigmail - GPG/PGP support
%bcond_without spellcheck # build without spellcheck function
%bcond_without ldap # disable e-mail address lookups in LDAP directories
#
+%define _rc b2
+%define _rel 2.1
Summary: Thunderbird Community Edition - email client
Summary(pl.UTF-8): Thunderbird Community Edition - klient poczty
Name: mozilla-thunderbird
-%define _rc b2
Version: 2.0
-Release: 0.%{_rc}.2
+Release: 0.%{_rc}.%{_rel}
License: MPL/LGPL
Group: Applications/Networking
Source0:
http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}%{_rc}/source/thunderbird-%{version}%{_rc}-source.tar.bz2
@@ -35,6 +36,7 @@
# fixing symptoms only
# https://bugzilla.mozilla.org/show_bug.cgi?id=362462
Patch7: mozilla-hack-gcc_4_2.patch
+Patch8: %{name}-install.patch
URL: http://www.mozilla.org/projects/thunderbird/
BuildRequires: automake
BuildRequires: freetype-devel >= 1:2.1.8
@@ -53,8 +55,8 @@
BuildRequires: xorg-lib-libXp-devel
BuildRequires: xorg-lib-libXt-devel
%if %{with enigmail}
-BuildRequires: /bin/ex
BuildRequires: /bin/csh
+BuildRequires: /bin/ex
%endif
Requires: nspr >= 1:4.6.1
Requires: nss >= 1:3.11.3
@@ -102,6 +104,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p2
+%patch8 -p1
:> config/gcc_hidden.h
@@ -191,14 +194,11 @@
install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}}
cd mozilla
-
%{__make} -C xpinstall/packager stage-package \
- MOZ_PKG_APPNAME=%{name} \
- SIGN_NSS= \
+ DESTDIR=$RPM_BUILD_ROOT \
+ MOZ_PKG_APPDIR=%{_libdir}/%{name} \
PKG_SKIP_STRIP=1
-cp -a dist/%{name} $RPM_BUILD_ROOT%{_libdir}
-
%{__sed} -e 's,@LIBDIR@,%{_libdir},' %{SOURCE3} >
$RPM_BUILD_ROOT%{_bindir}/mozilla-thunderbird
ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/thunderbird
@@ -298,6 +298,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.84 2007/02/26 13:38:42 glen
+- add -install.patch (install speedup by avoiding double copying)
+
Revision 1.83 2007/02/26 13:25:16 glen
- no _thunderbirddir macro
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mozilla-thunderbird.spec?r1=1.83&r2=1.84&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
