commit xfce4-dict for openSUSE:Factory

Hello community, here is the log from the commit of package xfce4-dict for openSUSE:Factory checked in at Sat Jan 15 03:14:14 CET 2011. -------- --- xfce4-dict/xfce4-dict.changes 2010-12-15 17:00:36.000000000 +0100 +++ xfce4-dict/xfce4-dict.changes 2011-01-14 17:47:32.000000000 +0100 @@ -1,0 +2,27 @@ +Fri Jan 14 16:44:11 UTC 2011 - gber@opensuse.org + +- do not require but recommend -lang subpackage + +------------------------------------------------------------------- +Mon Dec 27 14:58:37 UTC 2010 - gber@opensuse.org + +- suggest xfce4-panel-plugin-dict + +------------------------------------------------------------------- +Mon Dec 27 09:23:53 UTC 2010 - gber@opensuse.org + +- added xfce4-dict-0.6.0-use-correct-xfcepanelplugin-instance.patch + and xfce4-dict-0.6.0-fix-wrong-callback-arg.patch from git fixing + crashes + +------------------------------------------------------------------- +Mon Dec 27 08:51:58 UTC 2010 - gber@opensuse.org + +- corrected group +- improved summary/description +- split off xfce4-panel-plugin-dict subpackage +- split off lang subpackge +- do not install empty NEWS +- remove unsupported locales + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xfce4-dict-0.6.0-fix-wrong-callback-arg.patch xfce4-dict-0.6.0-use-correct-xfcepanelplugin-instance.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-dict.spec ++++++ --- /var/tmp/diff_new_pack.mZDAE0/_old 2011-01-15 03:13:38.000000000 +0100 +++ /var/tmp/diff_new_pack.mZDAE0/_new 2011-01-15 03:13:38.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package xfce4-dict (Version 0.6.0) +# spec file for package xfce4-dict # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,57 +16,82 @@ # +%define panel_version 4.7.0 Name: xfce4-dict Version: 0.6.0 -Release: 7 +Release: 8 License: GPLv2+ Summary: Xfce4 Dictionary Url: http://goodies.xfce.org/projects/applications/xfce4-dict -Group: System/GUI/XFCE +Group: Productivity/Office/Dictionary Source: http://goodies.xfce.org/releases/xfce4-dict/%{name}-%{version}.tar.bz2 +Patch0: xfce4-dict-0.6.0-use-correct-xfcepanelplugin-instance.patch +Patch1: xfce4-dict-0.6.0-fix-wrong-callback-arg.patch BuildRequires: intltool BuildRequires: perl-XML-Parser BuildRequires: pkgconfig(libxfce4panel-1.0) BuildRequires: pkgconfig(libxfce4util-1.0) BuildRequires: pkgconfig(libxfcegui4-1.0) BuildRequires: update-desktop-files -Requires: xfce4-panel BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: %{name}-lang = %{version} +Suggests: xfce4-panel-plugin-dict %description -This program allows you to search different kinds of dictionary services -for words or phrases and shows you the result. Currently you can query -a Dict server(RFC 2229), any online dictionary service by opening a web -browser or search for words using the aspell/ispell program. +xfce4-dict allows you to search different kinds of dictionary services for +words or phrases and shows you the result. Currently you can query a Dict +server(RFC 2229), any online dictionary service by opening a web browser or +search for words using the aspell/ispell program. -xfce4-dict contains a stand-alone application called "xfce4-dict" and a -panel plugin for the Xfce panel. +%package -n xfce4-panel-plugin-dict +License: GPLv2+ +Summary: Dictionary Plugin for the Xfce Panel +Group: Productivity/Office/Dictionary +Requires: xfce4-panel >= %panel_version +Requires: xfce4-dict = %version + +%description -n xfce4-panel-plugin-dict +xfce4-dict allows you to search different kinds of dictionary services for +words or phrases and shows you the result. Currently you can query a Dict +server(RFC 2229), any online dictionary service by opening a web browser or +search for words using the aspell/ispell program. + +This package contains the panel plugin for the Xfce panel. + +%lang_package %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %configure -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install %make_install %suse_update_desktop_file -r %{name} Office Dictionary GTK +rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %find_lang %{name} %clean rm -rf %{buildroot} -%files -f %{name}.lang +%files %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README -%{_bindir}/* -%{_libexecdir}/xfce4/panel-plugins/xfce4-dict-plugin +%doc AUTHORS COPYING ChangeLog README +%{_bindir}/xfce4-dict %{_datadir}/applications/*.desktop -%{_datadir}/xfce4/panel-plugins/*.desktop %{_datadir}/icons/hicolor/*/apps/* -%{_mandir}/man1/* -%dir %{_datadir}/xfce4 +%{_mandir}/man1/xfce4-dict.1* + +%files -n xfce4-panel-plugin-dict +%defattr(-,root,root) +%{_libexecdir}/xfce4/panel-plugins/xfce4-dict-plugin +%{_datadir}/xfce4/panel-plugins/*.desktop + +%files lang -f %{name}.lang %changelog ++++++ xfce4-dict-0.6.0-fix-wrong-callback-arg.patch ++++++

From 3b9d50855706c6f96512f9fa5a09878104acf8de Mon Sep 17 00:00:00 2001 From: Enrico Tröger Date: Sun, 19 Sep 2010 10:37:24 +0000 Subject: fix wrong callback argument

--- diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c index 6047db8..5374b18 100644 --- a/panel-plugin/xfce4-dict-plugin.c +++ b/panel-plugin/xfce4-dict-plugin.c @@ -371,7 +371,7 @@ static gboolean entry_buttonpress_cb(GtkWidget *entry, GdkEventButton *event, Di } -static void entry_changed_cb(GtkEditable *editable, DictData *dd) +static void entry_changed_cb(GtkEditable *editable, DictPanelData *dpd) { entry_is_dirty = TRUE; } -- cgit v0.8.3.4 ++++++ xfce4-dict-0.6.0-use-correct-xfcepanelplugin-instance.patch ++++++

From 1b9641f8a6a81e0a0c054c0ec46d760691d7cf2e Mon Sep 17 00:00:00 2001 From: Enrico Tröger Date: Sun, 05 Sep 2010 17:12:24 +0000 Subject: Use the correct XfcePanelPlugin instance when opening the preferences dialog to prevent crashes

--- diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c index 65eaa1b..6047db8 100644 --- a/panel-plugin/xfce4-dict-plugin.c +++ b/panel-plugin/xfce4-dict-plugin.c @@ -302,9 +302,10 @@ static void dict_plugin_properties_dialog_response(GtkWidget *dlg, gint response } -static void dict_plugin_properties_dialog(XfcePanelPlugin *plugin, DictPanelData *dpd) +static void dict_plugin_properties_dialog(GtkWidget *widget, DictPanelData *dpd) { GtkWidget *dlg; + XfcePanelPlugin *plugin = dpd->plugin; xfce_panel_plugin_block_menu(plugin); -- cgit v0.8.3.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org