[gnome-sudoku] Update to 3.11.2. Move to python 3

Yanko Kaneti yaneti at fedoraproject.org
Sat Nov 16 22:14:17 UTC 2013


commit 6ba515edf64a1a2445442082ae32c925ca32a240
Author: Yanko Kaneti <yaneti at declera.com>
Date:   Sun Nov 17 00:14:31 2013 +0200

    Update to 3.11.2. Move to python 3

 .gitignore                                         |    1 +
 ...-and-PREFIX-by-importing-defs-python3-sty.patch |   25 ++++++++++++++++++++
 gnome-sudoku.spec                                  |   14 ++++++++--
 sources                                            |    2 +-
 4 files changed, 38 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ab9c713..f2eac28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /gnome-sudoku-3.10.0.tar.xz
 /gnome-sudoku-3.10.1.tar.xz
 /gnome-sudoku-3.11.1.tar.xz
+/gnome-sudoku-3.11.2.tar.xz
diff --git a/0001-Fix-VERSION-and-PREFIX-by-importing-defs-python3-sty.patch b/0001-Fix-VERSION-and-PREFIX-by-importing-defs-python3-sty.patch
new file mode 100644
index 0000000..f25e6ad
--- /dev/null
+++ b/0001-Fix-VERSION-and-PREFIX-by-importing-defs-python3-sty.patch
@@ -0,0 +1,25 @@
+From 4a32a359a621e4eba2f4f26cc4af6fc4141aa811 Mon Sep 17 00:00:00 2001
+From: Yanko Kaneti <yaneti at declera.com>
+Date: Sun, 17 Nov 2013 00:03:07 +0200
+Subject: [PATCH] Fix VERSION and PREFIX by importing defs python3 style
+
+---
+ src/lib/defaults.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/defaults.py b/src/lib/defaults.py
+index 43e39e8..30f1540 100644
+--- a/src/lib/defaults.py
++++ b/src/lib/defaults.py
+@@ -14,7 +14,7 @@ import gettext
+ from gi.repository import GLib
+ 
+ try:
+-    from defs import VERSION, PREFIX
++    from .defs import VERSION, PREFIX
+ except ImportError:
+     PREFIX = "/usr"
+     VERSION = "0.0.0"
+-- 
+1.8.4.2
+
diff --git a/gnome-sudoku.spec b/gnome-sudoku.spec
index 0a4dd3c..df395e6 100644
--- a/gnome-sudoku.spec
+++ b/gnome-sudoku.spec
@@ -2,7 +2,7 @@
 
 Name:           gnome-sudoku
 Epoch:          1
-Version:        3.11.1
+Version:        3.11.2
 Release:        1%{?dist}
 Summary:        GNOME Sudoku game
 
@@ -10,6 +10,10 @@ License:        GPLv2+ and CC-BY-SA
 URL:            http://projects.gnome.org/gnome-games/
 Source0:        http://download.gnome.org/sources/gnome-sudoku/3.11/gnome-sudoku-%{version}.tar.xz
 
+# Fix the version in the about dialog
+# https://bugzilla.gnome.org/show_bug.cgi?id=71252
+Patch1:         0001-Fix-VERSION-and-PREFIX-by-importing-defs-python3-sty.patch
+
 BuildArch:      noarch
 
 BuildRequires:  desktop-file-utils
@@ -17,7 +21,7 @@ BuildRequires:  glib2-devel
 BuildRequires:  intltool
 BuildRequires:  itstool
 BuildRequires:  pygobject3-devel
-BuildRequires:  python2-devel
+BuildRequires:  python3-devel
 
 Requires:       pygobject3
 Requires:       gtk3
@@ -32,6 +36,7 @@ GNOME version of the popular Sudoku Japanese logic game.
 
 %prep
 %setup -q
+%patch1 -p1 -b .version
 
 %build
 %configure
@@ -78,10 +83,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/icons/HighContrast/*/apps/gnome-sudoku.*
 %{_datadir}/icons/hicolor/*/apps/gnome-sudoku.*
 %{_mandir}/man6/gnome-sudoku.6*
-%{python_sitelib}/gnome_sudoku
+%{python3_sitelib}/gnome_sudoku
 
 
 %changelog
+* Sat Nov 16 2013 Yanko Kaneti <yaneti at declera.com> - 3.11.2-1
+- Update to 3.11.2. Move to python 3
+
 * Mon Oct 28 2013 Yanko Kaneti <yaneti at declera.com> - 3.11.1-1
 - First release from the new upstream devel cycle
 
diff --git a/sources b/sources
index 797ace4..e9e16eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-069b56e488a434fce12a38ff25756b6e  gnome-sudoku-3.11.1.tar.xz
+53479e9ff2a43a127e463ed300e699fa  gnome-sudoku-3.11.2.tar.xz


More information about the scm-commits mailing list