commit mousepad for openSUSE:Factory

Hello community, here is the log from the commit of package mousepad for openSUSE:Factory checked in at Mon Jan 10 15:50:54 CET 2011. -------- --- mousepad/mousepad.changes 2009-04-27 10:05:57.000000000 +0200 +++ mousepad/mousepad.changes 2010-12-24 22:57:24.000000000 +0100 @@ -1,0 +2,17 @@ +Fri Dec 24 21:56:14 UTC 2010 - gber@opensuse.org + +- require -lang subpackage + +------------------------------------------------------------------- +Fri Dec 24 20:48:55 UTC 2010 - gber@opensuse.org + +- support more mime types +- split-off -lang subpackage +- corrected group +- improves summary/description +- added mousepad-0.2.16-fix-find-and-replace.patch from git in + order to fix a bug in find/replace +- added mousepad-0.2.16-fix-find.patch from git in order to fix a + bug in find + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mousepad-0.2.16-fix-find-and-replace.patch mousepad-0.2.16-fix-find.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mousepad.spec ++++++ --- /var/tmp/diff_new_pack.jERzLS/_old 2011-01-10 15:18:51.000000000 +0100 +++ /var/tmp/diff_new_pack.jERzLS/_new 2011-01-10 15:18:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mousepad (Version 0.2.16) # -# 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 @@ -19,13 +19,15 @@ Name: mousepad Version: 0.2.16 -Release: 8 +Release: 9 License: GPLv2+ -Summary: Simple Xfce oriented text editor +Summary: Simple Xfce-oriented Text Editor Url: http://www.xfce.org/projects/mousepad/ -Group: Productivity/Editors/Other +Group: Productivity/Text/Editors Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}-desktop.patch +Patch1: %{name}-0.2.16-fix-find-and-replace.patch +Patch2: %{name}-0.2.16-fix-find.patch BuildRequires: intltool BuildRequires: pango-devel BuildRequires: perl-XML-Parser @@ -36,15 +38,33 @@ BuildRequires: pkgconfig(libxfcegui4-1.0) BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: %{name}-lang = %{version} %description -Mousepad is a text editor for Xfce based on Leafpad. The initial reason -for Mousepad was to provide printing support, which would have been -difficult for Leafpad for various reasons. +Mousepad is a simple text editor for Xfce which has the following features: +* Complete support for UTF-8 text +* Cut/Copy/Paste and Select All text +* Search and Replace +* Font selection +* Word Wrap +* Character coding selection +* Auto character coding detection (UTF-8 and some codesets) +* Manual codeset setting +* Infinite Undo/Redo by word +* Auto Indent +* Multi-line Indent +* Display line numbers +* Drag and Drop +* Printing + + +%lang_package %prep %setup -q %patch0 +%patch1 -p1 +%patch2 -p1 %build %configure @@ -58,11 +78,13 @@ %clean rm -rf %{buildroot} -%files -f %{name}.lang +%files %defattr(-,root,root) %doc README ChangeLog COPYING AUTHORS %{_bindir}/mousepad %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/*.png +%files lang -f %{name}.lang + %changelog ++++++ mousepad-0.2.16-desktop.patch ++++++ --- /var/tmp/diff_new_pack.jERzLS/_old 2011-01-10 15:18:51.000000000 +0100 +++ /var/tmp/diff_new_pack.jERzLS/_new 2011-01-10 15:18:51.000000000 +0100 @@ -6,5 +6,5 @@ Terminal=false -MimeType=text/plain -Categories=Application;Utility;TextEditor;GTK; -+MimeType=text/plain; ++MimeType=application/x-awk;application/x-csh;application/x-perl;application/x-php;application/x-shellscript;text/plain;text/x-c;text/x-c++;text/x-c++hdr;text/x-chdr;text/x-c++src;text/x-csrc;text/x-fortran;text/x-java;text/x-log;text/x-makefile;text/x-moc;text/x-pascal;text/x-patch;text/x-python;text/x-readme;text/x-scheme;text/x-tcl;text/x-tex; +Categories=Utility;TextEditor;GTK; ++++++ mousepad-0.2.16-fix-find-and-replace.patch ++++++

From 80819d447df5661ee6c9e9cd22f501cee612da8b Mon Sep 17 00:00:00 2001 From: Lionel Le Folgoc Date: Mon, 05 Jul 2010 17:57:53 +0000 Subject: Fix find and replace (bug #5831).

--- diff --git a/src/search.c b/src/search.c index 07e29c7..4fb1c5b 100644 --- a/src/search.c +++ b/src/search.c @@ -210,8 +210,11 @@ gint run_dialog_find(StructData *sd) G_CALLBACK(toggle_sensitivity), NULL); g_signal_connect(G_OBJECT(entry_find), "delete-text", G_CALLBACK(toggle_sensitivity), NULL); - if (sd->search.string_find) + if (sd->search.string_find) { gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find); + gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), + GTK_RESPONSE_OK, TRUE); + } gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); gtk_entry_set_activates_default(GTK_ENTRY(entry_find), TRUE); @@ -275,8 +278,11 @@ gint run_dialog_replace(StructData *sd) G_CALLBACK(toggle_sensitivity), NULL); g_signal_connect(G_OBJECT(entry_find), "delete-text", G_CALLBACK(toggle_sensitivity), NULL); - if (sd->search.string_find) + if (sd->search.string_find) { gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find); + gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), + GTK_RESPONSE_OK, TRUE); + } label_replace = gtk_label_new_with_mnemonic(_("Re_place with: ")); gtk_misc_set_alignment(GTK_MISC(label_replace), 0, 0.5); gtk_table_attach_defaults(GTK_TABLE(table), label_replace, 0, 1, 1, 2); -- cgit v0.8.3.4 ++++++ mousepad-0.2.16-fix-find.patch ++++++

From a6383ccf4e3ba425ffb6489a795785e6a626c048 Mon Sep 17 00:00:00 2001 From: Nick Schermer Date: Tue, 06 Jul 2010 15:53:54 +0000 Subject: Also fix find (bug #6544).

--- diff --git a/src/search.c b/src/search.c index 4fb1c5b..91f69cf 100644 --- a/src/search.c +++ b/src/search.c @@ -78,7 +78,7 @@ gboolean document_search_real(StructData *sd, gint direction) static gint document_replace_real(StructData *sd) { GtkTextIter iter, match_start, match_end; - GtkTextMark *mark_init = NULL; + GtkTextMark *mark_init = NULL, *mark_start, *mark_end; gboolean res; gint num = 0; GtkWidget *q_dialog = NULL; @@ -113,6 +113,11 @@ static gint document_replace_real(StructData *sd) if (num == 0 && q_dialog == NULL) q_dialog = create_dialog_message_question( gtk_widget_get_toplevel(sd->mainwin->textview), _("Replace?")); + + gtk_text_buffer_get_selection_bounds(textbuffer, &match_start, &match_end); + mark_start = gtk_text_buffer_create_mark(textbuffer, NULL, &match_start, FALSE); + mark_end = gtk_text_buffer_create_mark(textbuffer, NULL, &match_end, FALSE); + switch (gtk_dialog_run(GTK_DIALOG(q_dialog))) { case GTK_RESPONSE_CANCEL: res = 0; @@ -122,6 +127,11 @@ static gint document_replace_real(StructData *sd) case GTK_RESPONSE_NO: continue; } + + gtk_text_buffer_get_iter_at_mark(textbuffer, &match_start, mark_start); + gtk_text_buffer_get_iter_at_mark(textbuffer, &match_end, mark_end); + gtk_text_buffer_move_mark_by_name(textbuffer, "selection_bound", &match_start); + gtk_text_buffer_move_mark_by_name(textbuffer, "insert", &match_end); } gtk_text_buffer_delete_selection(textbuffer, TRUE, TRUE); undo_set_sequency(TRUE); -- 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