Hello community, here is the log from the commit of package aisleriot for openSUSE:Factory checked in at 2020-01-29 21:40:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aisleriot (Old) and /work/SRC/openSUSE:Factory/.aisleriot.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aisleriot" Wed Jan 29 21:40:26 2020 rev:56 rq:767860 version:3.22.10 Changes: -------- --- /work/SRC/openSUSE:Factory/aisleriot/aisleriot.changes 2019-09-13 14:58:07.021276724 +0200 +++ /work/SRC/openSUSE:Factory/.aisleriot.new.26092/aisleriot.changes 2020-01-29 21:40:27.674719935 +0100 @@ -1,0 +2,20 @@ +Thu Jan 16 14:09:03 UTC 2020 - Jonathan Brielmaier <[email protected]> + +- Update to version 3.22.10: + * Switch to the meson build system. + * remove intltool marks from AppData file. + * Update translations. + * Fix reshuffling. + * Some fixes and cleanups. +- Add patch: + * add-guile-3.0-support.patch: Allows building with Guile 3.0. +- Switch download link, as release is not on download.gnome.org +- New build requires: gcc-c++, meson and pkgconfig(libxml-2.0) +- Remove no longer needed dependencies: intltool +- Switch to meson build system, build with the defaults and remove + hack for configure script +- Install README.md +- Don't install ChangeLog anymore, as it got removed +- sol.appdata.xml was renamed to sol.metainfo.xml + +------------------------------------------------------------------- Old: ---- aisleriot-3.22.9.tar.xz New: ---- add-guile-3.0-support.patch aisleriot-3.22.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aisleriot.spec ++++++ --- /var/tmp/diff_new_pack.N6gGXr/_old 2020-01-29 21:40:29.010720452 +0100 +++ /var/tmp/diff_new_pack.N6gGXr/_new 2020-01-29 21:40:29.046720466 +0100 @@ -1,7 +1,7 @@ # # spec file for package aisleriot # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,21 @@ Name: aisleriot -Version: 3.22.9 +Version: 3.22.10 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://download.gnome.org/sources/aisleriot/3.22/%{name}-%{version}.tar.xz - +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 -BuildRequires: intltool # Needed to get lsb data BuildRequires: lsb-release +BuildRequires: meson >= 0.49 BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: yelp-tools @@ -38,6 +40,7 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 3.18.0 BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(librsvg-2.0) +BuildRequires: pkgconfig(libxml-2.0) Requires: guile %description @@ -61,27 +64,20 @@ %autosetup -p1 %build -# Hack up configure. This allows us not having to rely on openSUSE-release, which is a daily changing package -sed -i 's:DISTRO="unknown":DISTRO="opensuse":' configure -%configure \ - --disable-schemas-install \ - --disable-static \ - --enable-sound \ - --with-guile=auto \ - --with-platform=gtk-only \ - --with-gtk=3.0 \ +%meson \ + -Dtheme_kde=false \ %{nil} -%make_build +%meson_build %install -%make_install +%meson_install %fdupes -s %{buildroot}%{_datadir}/help %suse_update_desktop_file -N "AisleRiot" -G "Solitaire" sol %find_lang %{name} %{?no_lang_C} %files %license COPYING.GFDL -%doc AUTHORS ChangeLog +%doc AUTHORS README.md %if 0%{?suse_version} <= 1140 %doc %dir %{_datadir}/help %doc %dir %{_datadir}/help/C @@ -89,7 +85,7 @@ %doc %{_datadir}/help/C/aisleriot/ %{_bindir}/sol %dir %{_datadir}/metainfo -%{_datadir}/metainfo/sol.appdata.xml +%{_datadir}/metainfo/sol.metainfo.xml %{_datadir}/applications/sol.desktop %{_datadir}/aisleriot/ %dir %{_libdir}/aisleriot ++++++ add-guile-3.0-support.patch ++++++ commit 4c79d5b039cc24066ed12d6b04b43954d29e9434 (origin/master, origin/HEAD) Author: Jonathan Brielmaier <[email protected]> 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
