bruno pushed to gnubik (master). "Update to 2.4.2 (..more)"

[notifications at fedoraproject.org]

From 2f48bf6a61463f38c8c55a209f090130454fc58c Mon Sep 17 00:00:00 2001
From: Bruno Wolff III <bruno at wolff.to>
Date: Thu, 14 May 2015 23:38:11 -0500
Subject: Update to 2.4.2

We no longer need to carry the format fixup patch. There are some
translation improvements.

diff --git a/.gitignore b/.gitignore
index 545c3a5..14d1a56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 gnubik-2.3.tar.gz
 /gnubik-2.4.tar.gz
 /gnubik-2.4.1.tar.gz
+/gnubik-2.4.2.tar.gz
diff --git a/format_fix.patch b/format_fix.patch
deleted file mode 100644
index 3fb5bdd..0000000
--- a/format_fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/menus.c.orig	2014-06-08 22:14:26.461547599 -0500
-+++ src/menus.c	2014-06-08 22:26:31.906747953 -0500
-@@ -549,7 +549,7 @@
-   dialog = gtk_message_dialog_new (parent,
- 				   GTK_DIALOG_MODAL,
- 				   GTK_MESSAGE_ERROR,
--				   GTK_BUTTONS_CLOSE, message);
-+				   GTK_BUTTONS_CLOSE, '%s', message);
-   g_free (message);
- 
-   gtk_window_set_title (GTK_WINDOW (dialog), _("Gnubik error"));
---- src/swatch.c.orig	2014-06-08 22:41:24.502192244 -0500
-+++ src/swatch.c	2014-06-08 22:42:13.052362721 -0500
-@@ -255,7 +255,7 @@
- 	    utf8 = g_locale_to_utf8 (*s, -1, 0, 0, &gerr);
- 	    if (gerr)
- 	      {
--		g_warning (gerr->message);
-+		g_warning ('%s', gerr->message);
- 		g_clear_error (&gerr);
- 		gerr = 0;
- 		continue;
-@@ -265,7 +265,7 @@
- 	    filename = g_filename_from_uri (utf8, 0, &gerr);
- 	    if (gerr)
- 	      {
--		g_warning (gerr->message);
-+		g_warning ('%s', gerr->message);
- 		g_clear_error (&gerr);
- 		continue;
- 	      }
diff --git a/gnubik.spec b/gnubik.spec
index c145dfd..f7930b1 100644
--- a/gnubik.spec
+++ b/gnubik.spec
@@ -1,6 +1,6 @@
 Name:           gnubik
-Version:        2.4.1
-Release:        5%{?dist}
+Version:        2.4.2
+Release:        1%{?dist}
 Summary:        3D interactive graphics puzzle
 
 Group:          Amusements/Games
@@ -9,7 +9,6 @@ URL:            http://www.gnu.org/software/gnubik/
 Source0:        ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 # Don't use error messages used as a formats
-Patch1:         format_fix.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  libX11-devel guile-devel libGL-devel libGLU-devel gtk2-devel gtkglext-devel
@@ -29,7 +28,6 @@ chmod -x src/{quarternion,txfm}.{c,h}
 # Remove pregenerated binaries and let them be gerenerated
 rm po/*.pot
 rm doc/%{name}.info
-%patch1 -b .format_fix
 
 
 %build
@@ -91,6 +89,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu May 14 2015 Bruno Wolff III <bruno at wolff.to> 2.4.2-1
+- Error message patch is no longer needed
+- Some translation improvements
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 4230b96..2702ab0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-62433d6b65d046e7f56fb8b41ea1837c  gnubik-2.4.1.tar.gz
+b33043f845f4fe0a6cce287dba11bbff  gnubik-2.4.2.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gnubik.git/commit/?h=master&id=2f48bf6a61463f38c8c55a209f090130454fc58c