[packages/im-chooser] - updated to 1.6.4 - removed obsolete format-security patch

qboosh qboosh at pld-linux.org
Fri Jul 26 16:37:15 CEST 2013


commit caef38e48050529580ce1f0b86c69468a5a0375b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jul 26 16:37:36 2013 +0200

    - updated to 1.6.4
    - removed obsolete format-security patch

 im-chooser-format-security.patch | 84 ----------------------------------------
 im-chooser.spec                  |  7 ++--
 2 files changed, 3 insertions(+), 88 deletions(-)
---
diff --git a/im-chooser.spec b/im-chooser.spec
index b70e053..e7dd205 100644
--- a/im-chooser.spec
+++ b/im-chooser.spec
@@ -6,14 +6,13 @@
 Summary:	Desktop Input Method configuration tool
 Summary(pl.UTF-8):	Narzędzie do konfiguracji metod wprowadzania znaków dla środowiska graficznego
 Name:		im-chooser
-Version:	1.6.2
+Version:	1.6.4
 Release:	1
 License:	GPL v2
 Group:		Applications
 Source0:	http://fedorahosted.org/releases/i/m/im-chooser/%{name}-%{version}.tar.bz2
-# Source0-md5:	7ca05d1d360303754d6d62cbfa79bd1c
+# Source0-md5:	fbf6598df98c9992e91aa62b7d33bc1b
 Patch0:		%{name}-imchooserui.patch
-Patch1:		%{name}-format-security.patch
 URL:		http://fedorahosted.org/im-chooser/
 BuildRequires:	glib2-devel >= 1:2.16.0
 BuildRequires:	imsettings-devel >= 1.3.0
@@ -61,7 +60,6 @@ Ten pakiet zawiera aplikację przeznaczoną dla Xfce 4.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure \
@@ -99,6 +97,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/imchooseui
 %{_desktopdir}/im-chooser.desktop
 %{_iconsdir}/hicolor/*/apps/im-chooser.png
+%{_mandir}/man1/im-chooser.1*
 
 %if %{with xfce}
 %files xfce
diff --git a/im-chooser-format-security.patch b/im-chooser-format-security.patch
deleted file mode 100644
index 2dbf2d1..0000000
--- a/im-chooser-format-security.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- im-chooser-1.6.1/libimchooseui/eggsmclient-dbus-gnome.c~	2011-10-07 12:26:11.000000000 +0200
-+++ im-chooser-1.6.1/libimchooseui/eggsmclient-dbus-gnome.c	2012-11-12 22:20:30.599358051 +0100
-@@ -77,7 +77,7 @@
- 										 &err);
- 
- 		if (err) {
--			g_warning(err->message);
-+			g_warning("%s", err->message);
- 			return NULL;
- 		}
- 		info = g_dbus_interface_info_ref(introspection_data->interfaces[0]);
-@@ -120,7 +120,7 @@
- 	if (value)
- 		g_variant_unref(value);
- 	if (err) {
--		g_warning(err->message);
-+		g_warning("%s", err->message);
- 		g_error_free(err);
- 
- 		return FALSE;
-@@ -160,7 +160,7 @@
- 					      NULL,
- 					      &err);
- 	if (err) {
--		g_warning(err->message);
-+		g_warning("%s", err->message);
- 		g_error_free(err);
- 		return NULL;
- 	}
---- im-chooser-1.6.1/libimchooseui/eggsmclient-dbus-kde.c~	2011-10-07 12:27:58.000000000 +0200
-+++ im-chooser-1.6.1/libimchooseui/eggsmclient-dbus-kde.c	2012-11-12 22:21:10.332689583 +0100
-@@ -77,7 +77,7 @@
- 										 &err);
- 
- 		if (err) {
--			g_warning(err->message);
-+			g_warning("%s", err->message);
- 			return NULL;
- 		}
- 		info = g_dbus_interface_info_ref(introspection_data->interfaces[0]);
-@@ -112,7 +112,7 @@
- 	if (value)
- 		g_variant_unref(value);
- 	if (err) {
--		g_warning(err->message);
-+		g_warning("%s", err->message);
- 		g_error_free(err);
- 
- 		return FALSE;
-@@ -152,7 +152,7 @@
- 					      NULL,
- 					      &err);
- 	if (err) {
--		g_warning(err->message);
-+		g_warning("%s", err->message);
- 		g_error_free(err);
- 		return NULL;
- 	}
---- im-chooser-1.6.1/src/app/main.c~	2012-07-12 13:17:55.000000000 +0200
-+++ im-chooser-1.6.1/src/app/main.c	2012-11-12 22:23:24.242685099 +0100
-@@ -92,8 +92,8 @@
- 						 GTK_DIALOG_MODAL,
- 						 GTK_MESSAGE_ERROR,
- 						 GTK_BUTTONS_OK,
--						 s);
--	gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG (dlg), details);
-+						 "%s", s);
-+	gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG (dlg), "%s", details);
- 
- 	/* for GNOME HIG compliance */
- #if 0
---- im-chooser-1.6.1/src/xfce/main.c~	2011-08-01 08:36:02.000000000 +0200
-+++ im-chooser-1.6.1/src/xfce/main.c	2012-11-12 22:25:32.729347232 +0100
-@@ -94,8 +94,8 @@
- 						 GTK_DIALOG_MODAL,
- 						 GTK_MESSAGE_ERROR,
- 						 GTK_BUTTONS_OK,
--						 s);
--	gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG (dlg), details);
-+						 "%s", s);
-+	gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG (dlg), "%s", details);
- 
- 	/* for GNOME HIG compliance */
- 	gtk_rc_parse_string("style \"imchoose-ui-message-dialog\" {\n"	\
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/im-chooser.git/commitdiff/caef38e48050529580ce1f0b86c69468a5a0375b



More information about the pld-cvs-commit mailing list