Hello community,
here is the log from the commit of package MozillaThunderbird for openSUSE:Factory
checked in at Mon Aug 10 18:18:55 CEST 2009.
--------
--- MozillaThunderbird/MozillaThunderbird.changes 2009-07-28 13:00:05.000000000 +0200
+++ MozillaThunderbird/MozillaThunderbird.changes 2009-08-09 09:15:44.000000000 +0200
@@ -1,0 +2,8 @@
+Sun Aug 9 09:02:25 CEST 2009 - wr@rosenauer.org
+
+- Gtk filechooser allows alternative button order (as used in KDE)
+ (bnc#527418)
+- translations{,-common} package doesn't provide en-US
+- split translations into -common and -other packages (bnc#529180)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
mozilla-gtkfilepicker-buttonorder.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MozillaThunderbird.spec ++++++
--- /var/tmp/diff_new_pack.M9cpbv/_old 2009-08-10 18:17:09.000000000 +0200
+++ /var/tmp/diff_new_pack.M9cpbv/_new 2009-08-10 18:17:09.000000000 +0200
@@ -27,10 +27,10 @@
%if %suse_version > 1100
BuildRequires: nss-shared-helper-devel
%endif
-License: GPL v2 or later ; LGPL v2.1 or later ; MPL ..
+License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later
%define mainversion 3.0b3
Version: %{mainversion}
-Release: 2
+Release: 3
Summary: The Stand-Alone Mozilla Mail Component
Url: http://www.mozilla.org/products/thunderbird/
Group: Productivity/Networking/Email/Clients
@@ -48,6 +48,7 @@
Patch1: mozilla-app-launcher.patch
Patch2: thunderbird-appname.patch
Patch3: mozilla-jemalloc_deepbind.patch
+Patch4: mozilla-gtkfilepicker-buttonorder.patch
Patch5: tb-develdirs.patch
Patch7: mozilla-path_len.patch
Patch9: mozilla-shared-nss-db.patch
@@ -83,28 +84,34 @@
Mozilla application suite.
+%package translations-common
+License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later
+Summary: Common translations for MozillaThunderbird
+Provides: locale(%{name}:ar;ca;cs;de;en_GB;es_AR;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN)
+Group: Productivity/Networking/Email/Clients
+PreReq: %{name} = %{mainversion}
+Obsoletes: %{name}-translations < %{version}-%{release}
+
+%description translations-common
+This package contains several optional languages for the user interface
+of MozillaThunderbird.
+
-Authors:
---------
- Mozilla Foundation
-
-%package translations
-License: GPL v2 or later ; LGPL v2.1 or later ; MPL ..
-Summary: Translations of MozillaThunderbird
-Provides: locale(%{name}:af;ar;be;bn_BD;ca;cs;de;el;en_GB;en_US;es_AR;es_ES;et;eu;fi;fr;fy_NL;ga_IE;gl;hu;id;is;it;ja;linux;win32;ja_JP_mac;osx;ko;lt;nb_NO;nl;nn_NO;pa_IN;pl;pt_BR;pt_PT;ro;ru;si;sk;sq;sv_SE;ta_LK;tr;uk;vi;zh_CN)
+%package translations-other
+License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later
+Summary: Extra translations for MozillaThunderbird
+Provides: locale(%{name}:af;be;bn_BD;el;et;eu;fy_NL;ga_IE;gl;id;is;lt;nn_NO;pa_IN;ro;si;sk;sq;ta_LK;tr;uk;vi)
Group: Productivity/Networking/Email/Clients
PreReq: %{name} = %{mainversion}
+Obsoletes: %{name}-translations < %{version}-%{release}
-%description translations
+%description translations-other
This package contains several optional languages for the user interface
of MozillaThunderbird.
-Authors:
---------
- Mozilla Foundation
%package devel
-License: GPL v2 or later ; LGPL v2.1 or later ; MPL ..
+License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later
Summary: Mozilla Thunderbird SDK
Group: Development/Libraries/Other
Requires: mozilla-nspr-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel)
@@ -114,17 +121,13 @@
%description devel
Software Development Kit to build plugins/extensions against Thunderbird.
-Authors:
---------
- Mozilla Foundation
-
%if %lightning
%package lightning
Version: 0.9
Release: 1
-License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
+License: GPL v2 or later ; LGPL v2.1 or later ; MPL
Summary: Calendaring extension for Thunderbird
Group: Productivity/Networking/Email/Clients
PreReq: %{name} = %{mainversion}
@@ -136,8 +139,8 @@
%package -n enigmail
Version: 0.95.99
-Release: 2
-License: GPL v2 or later ; MPL ..
+Release: 3
+License: GPL v2 or later ; MPL
Summary: OpenPGP addon for Thunderbird and SeaMonkey
Group: Productivity/Networking/Email/Clients
Url: http://enigmail.mozdev.org
@@ -160,6 +163,7 @@
pushd mozilla
%patch1 -p1
%patch3 -p1
+%patch4 -p1
%patch7 -p1
%patch9 -p1
pushd extensions
@@ -245,7 +249,7 @@
%if 0%{?SOURCE5:1}
cp %SOURCE5 mail/locales/shipped-locales
%endif
-echo %defattr\(-,root,root\) > %{_tmppath}/translations.list
+rm -f %{_tmppath}/translations.*
for locale in $(awk '{ print $1; }' mail/locales/shipped-locales); do
case $locale in
ja-JP-mac|en-US)
@@ -257,8 +261,14 @@
$RPM_BUILD_ROOT%{progdir}/chrome
cp mozilla/dist/xpi-stage/locale-$locale/chrome/$locale.manifest \
$RPM_BUILD_ROOT%{progdir}/chrome
- echo %{progdir}/chrome/$locale.jar >> %{_tmppath}/translations.list
- echo %{progdir}/chrome/$locale.manifest >> %{_tmppath}/translations.list
+ # check against the fixed common list and sort into the right filelist
+ _matched=0
+ for _match in ar ca cs da de en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do
+ [ "$_match" = "$locale" ] && _matched=1
+ done
+ [ $_matched -eq 1 ] && _l10ntarget=common || _l10ntarget=other
+ echo %{progdir}/chrome/$locale.jar >> %{_tmppath}/translations.$_l10ntarget
+ echo %{progdir}/chrome/$locale.manifest >> %{_tmppath}/translations.$_l10ntarget
esac
done
%endif
@@ -363,6 +373,9 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%if %localize
+rm -rf %{_tmppath}/translations.*
+%endif
%triggerin -- myspell-dictionary
%progdir/add-plugins.sh > /dev/null 2>&1
@@ -438,7 +451,10 @@
%{_bindir}/%{progname}
%if %localize
-%files translations -f %{_tmppath}/translations.list
+%files translations-common -f %{_tmppath}/translations.common
+%defattr(-,root,root)
+
+%files translations-other -f %{_tmppath}/translations.other
%defattr(-,root,root)
%endif
++++++ mozilla-gtkfilepicker-buttonorder.patch ++++++
From: Wolfgang Rosenauer
Subject: Gtk filechooser should support alternative button order (as used in KDE)
References:
http://bugzilla.novell.com/show_bug.cgi?id=527418
diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp
--- a/widget/src/gtk2/nsFilePicker.cpp
+++ b/widget/src/gtk2/nsFilePicker.cpp
@@ -95,6 +95,7 @@ typedef GtkWidget* (*_gtk_file_chooser_d
GtkFileChooserAction action,
const gchar *first_button_text,
...);
+typedef void (*_gtk_dialog_set_alternative_button_order_fn)(GtkDialog *dialog, gint first_response_id, ...);
typedef void (*_gtk_file_chooser_set_select_multiple_fn)(GtkFileChooser* chooser, gboolean truth);
typedef void (*_gtk_file_chooser_set_do_overwrite_confirmation_fn)(GtkFileChooser* chooser, gboolean do_confirm);
typedef void (*_gtk_file_chooser_set_current_name_fn)(GtkFileChooser* chooser, const gchar* name);
@@ -119,6 +120,7 @@ DECL_FUNC_PTR(gtk_file_chooser_get_filen
DECL_FUNC_PTR(gtk_file_chooser_get_uri);
DECL_FUNC_PTR(gtk_file_chooser_get_uris);
DECL_FUNC_PTR(gtk_file_chooser_dialog_new);
+DECL_FUNC_PTR(gtk_dialog_set_alternative_button_order);
DECL_FUNC_PTR(gtk_file_chooser_set_select_multiple);
DECL_FUNC_PTR(gtk_file_chooser_set_do_overwrite_confirmation);
DECL_FUNC_PTR(gtk_file_chooser_set_current_name);
@@ -214,6 +216,7 @@ nsFilePicker::LoadSymbolsGTK24()
GET_LIBGTK_FUNC(gtk_file_chooser_get_uri);
GET_LIBGTK_FUNC(gtk_file_chooser_get_uris);
GET_LIBGTK_FUNC(gtk_file_chooser_dialog_new);
+ GET_LIBGTK_FUNC(gtk_dialog_set_alternative_button_order);
GET_LIBGTK_FUNC(gtk_file_chooser_set_select_multiple);
GET_LIBGTK_FUNC_OPT(gtk_file_chooser_set_do_overwrite_confirmation);
GET_LIBGTK_FUNC(gtk_file_chooser_set_current_name);
@@ -605,6 +608,12 @@ nsFilePicker::Show(PRInt16 *aReturn)
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
accept_button, GTK_RESPONSE_ACCEPT,
NULL);
+
+ _gtk_dialog_set_alternative_button_order(GTK_DIALOG(file_chooser),
+ GTK_RESPONSE_ACCEPT,
+ GTK_RESPONSE_CANCEL,
+ -1);
+
if (mAllowURLs) {
_gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(file_chooser), FALSE);
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org