Accepting request 823632 from home:elimat:branches:GNOME:Factory

- Update to version 3.22.11:
  * Update translations
  * Support for guile-3.0
- Remove patch:
  * add-guile-3.0-support.patch: it was fixed upstream
- Run spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/823632
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/aisleriot?expand=0&rev=113

add-guile-3.0-support.patch

@@ -1,42 +0,0 @@
-commit 4c79d5b039cc24066ed12d6b04b43954d29e9434 (origin/master, origin/HEAD)
-Author: Jonathan Brielmaier <jonathan.brielmaier@web.de>
-Date:   Wed Jan 15 21:04:20 2020 +0100
-
-    build: Allow build with Guile 3.0.
-    
-    https://gitlab.gnome.org/GNOME/aisleriot/issues/26
-
-diff --git a/meson.build b/meson.build
-index e9807e22..3bbab5ec 100644
---- a/meson.build
-+++ b/meson.build
-@@ -46,6 +46,7 @@ glib_req_version            = '2.32.0'
- gtk_req_version             = '3.18.0'
- guile_2_0_req_version       = '2.0.0'
- guile_2_2_req_version       = '2.2.0'
-+guile_3_0_req_version       = '3.0.0'
- libcanberra_gtk_req_version = '0.26'
- qt5svg_req_version          = '5.0.0'
- rsvg_req_version            = '2.32.0'
-@@ -315,7 +316,9 @@ config_h.set_quoted('PYSOL_CARD_THEME_PATH', theme_pysol_path,)
- # Guile
- 
- if get_option('guile') == 'auto'
--  if dependency('guile-2.2', required: false,).found()
-+  if dependency('guile-3.0', required: false,).found()
-+    guile_version = '3.0'
-+  elif dependency('guile-2.2', required: false,).found()
-     guile_version = '2.2'
-   elif dependency('guile-2.0', required: false,).found()
-     guile_version = '2.0'
-@@ -328,7 +331,9 @@ endif
- 
- guile_req = 'guile-' + guile_version
- 
--if guile_version == '2.2'
-+if guile_version == '3.0'
-+  guile_req_version = guile_3_0_req_version
-+elif guile_version == '2.2'
-   guile_req_version = guile_2_2_req_version
- elif guile_version == '2.0'
-   guile_req_version = guile_2_0_req_version

aisleriot-3.22.10.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:703772cfd0ef2d751e0b8d47173319b596886f9613a1f718db85d4712c28db72
-size 7893259

aisleriot-3.22.11.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fba17cdb2b950b0fb3969d098faa963400ab1a4561624d3ded691384b4a6b5d5
+size 7976901

aisleriot.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jul 30 20:33:25 UTC 2020 - Matthias Eliasson <elimat@opensuse.org>
+
+- Update to version 3.22.11:
+  * Update translations
+  * Support for guile-3.0
+- Remove patch:
+  * add-guile-3.0-support.patch: it was fixed upstream
+- Run spec-cleaner
+
 -------------------------------------------------------------------
 Thu Jan 16 14:09:03 UTC 2020 - Jonathan Brielmaier <jbrielmaier@suse.de>
 

aisleriot.spec

@@ -17,15 +17,12 @@
 
 
 Name:           aisleriot
-Version:        3.22.10
+Version:        3.22.11
 Release:        0
 Summary:        Solitaire Card Games for GNOME
 License:        GPL-3.0-or-later
-Group:          Amusements/Games/Board/Card
 URL:            https://wiki.gnome.org/Apps/Aisleriot
 Source0:        https://gitlab.gnome.org/GNOME/aisleriot/-/archive/%{version}/aisleriot-%{version}.tar.gz
-# PATCH-FEATURE-UPSTREAM allow buidl with Guile 3.0 -- 4c79d5b0
-Patch0:         add-guile-3.0-support.patch
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  guile-devel
@@ -48,7 +45,6 @@ Aisleriot is a compilation of 80 different solitaire card games.
 
 %package themes
 Summary:        Extra themes for the Aisleriot solitaire card game program
-Group:          Amusements/Games/Board/Card
 Requires:       %{name} = %{version}
 Enhances:       %{name}
 BuildArch:      noarch