SPECS (AC-branch): mozilla-thunderbird.spec - don't use BUILD_OFFI...
hawk
hawk at pld-linux.org
Sat Jan 27 12:30:53 CET 2007
Author: hawk Date: Sat Jan 27 11:30:53 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- don't use BUILD_OFFICIAL/MOZILLA_OFFICIAL, we are not allowed to do so
- s/Mozilla Thunderbird/Thunderbird Community Edition/, "Mozilla Thunderbird"
is a registered trademark and we can't use that name
- adapterized
---- Files affected:
SPECS:
mozilla-thunderbird.spec (1.61.2.11 -> 1.61.2.12)
---- Diffs:
================================================================
Index: SPECS/mozilla-thunderbird.spec
diff -u SPECS/mozilla-thunderbird.spec:1.61.2.11 SPECS/mozilla-thunderbird.spec:1.61.2.12
--- SPECS/mozilla-thunderbird.spec:1.61.2.11 Thu Dec 21 00:43:30 2006
+++ SPECS/mozilla-thunderbird.spec Sat Jan 27 12:30:44 2007
@@ -9,8 +9,8 @@
%bcond_without spellcheck # build without spellcheck function
%bcond_without ldap # disable e-mail address lookups in LDAP directories
#
-Summary: Mozilla Thunderbird - email client
-Summary(pl): Mozilla Thunderbird - klient poczty
+Summary: Thunderbird Community Edition - email client
+Summary(pl): Thunderbird Community Edition - klient poczty
Name: mozilla-thunderbird
Version: 1.5.0.9
Release: 1
@@ -43,8 +43,8 @@
BuildRequires: pango-devel >= 1:1.1.0
BuildRequires: sed >= 4.0
%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
@@ -58,11 +58,12 @@
%define _noautoreqdep libgfxpsshar.so libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libldap50.so libmozjs.so libprldap50.so libxpcom.so libxpcom_compat.so libxpcom_core.so libxpistub.so
%description
-Mozilla Thunderbird is an open-source,fast and portable email client.
+Thunderbird Community Edition is an open-source,fast and portable
+email client.
%description -l pl
-Mozilla Thunderbird jest open sourcowym, szybkim i przenośnym klientem
-poczty.
+Thunderbird Community Edition jest open sourcowym, szybkim i
+przenośnym klientem poczty.
%package dictionary-en-US
Summary: English (US) dictionary for spellchecking
@@ -72,13 +73,13 @@
%description dictionary-en-US
This package contains English (US) myspell-compatible dictionary used
-for spellcheck function of mozilla-thunderbird. An alternative for
-this can be the OpenOffice's dictionary.
+for spellcheck function of Thunderbird Community Edition. An
+alternative for this can be the OpenOffice's dictionary.
%description dictionary-en-US -l pl
Ten pakiet zawiera angielski (USA) słownik kompatybilny z myspellem,
-używany przez funkcję sprawdzania pisowni mozilli-thunderbird.
-Alternatywą dla niego może być słownik OpenOffice'a.
+używany przez funkcję sprawdzania pisowni w Thunderbird Community
+Edition. Alternatywą dla niego może być słownik OpenOffice'a.
%prep
%setup -q -n mozilla
@@ -104,13 +105,6 @@
cat << 'EOF' > .mozconfig
. $topsrcdir/mail/config/mozconfig
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-#export MOZ_THUNDERBID=1
-
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
ac_add_options --prefix=%{_prefix}
ac_add_options --exec-prefix=%{_exec_prefix}
ac_add_options --bindir=%{_bindir}
@@ -198,9 +192,9 @@
%if %{with enigmail}
_enig_dir=$RPM_BUILD_ROOT%{_thunderbirddir}/extensions/\{847b3a00-7ab1-11d4-8f02-006008948af5\}
-mkdir -p $_enig_dir/chrome
-mkdir -p $_enig_dir/components
-mkdir -p $_enig_dir/defaults/preferences
+install -d $_enig_dir/chrome
+install -d $_enig_dir/components
+install -d $_enig_dir/defaults/preferences
mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmail.jar $_enig_dir/chrome
mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmail-skin-tbird.jar $_enig_dir/chrome
mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/components/enig* $_enig_dir/components
@@ -290,6 +284,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.61.2.12 2007/01/27 11:30:44 hawk
+- don't use BUILD_OFFICIAL/MOZILLA_OFFICIAL, we are not allowed to do so
+- s/Mozilla Thunderbird/Thunderbird Community Edition/, "Mozilla Thunderbird"
+ is a registered trademark and we can't use that name
+- adapterized
+
Revision 1.61.2.11 2006/12/20 23:43:30 mguevara
- 1.5.0.9-1
- fixes CVE-2006-6497, CVE-2006-6498, CVE-2006-6499, CVE-2006-6500,
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mozilla-thunderbird.spec?r1=1.61.2.11&r2=1.61.2.12&f=u
More information about the pld-cvs-commit
mailing list