diff --git a/aisleriot-3.3.0.tar.bz2 b/aisleriot-3.3.0.tar.bz2 deleted file mode 100644 index 5f63d25..0000000 --- a/aisleriot-3.3.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61927f232b817e00d12d7d5497e37c90e541a81eb1a1129e3b9683196de234d5 -size 5536143 diff --git a/aisleriot-3.3.1.tar.xz b/aisleriot-3.3.1.tar.xz new file mode 100644 index 0000000..8b2c101 --- /dev/null +++ b/aisleriot-3.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a91dccdbe05286f80c8c6484822e7e599cc5cf11816371d38529157dfef97335 +size 4355132 diff --git a/aisleriot-automagic-guile.patch b/aisleriot-automagic-guile.patch deleted file mode 100644 index 8871d5e..0000000 --- a/aisleriot-automagic-guile.patch +++ /dev/null @@ -1,60 +0,0 @@ -commit 3223853fcb8f519d7736d13bd8c30da6434d8cef -Author: Vincent Untz -Date: Sun Sep 4 09:53:21 2011 +0200 - - Allow automagic selection of guile - - We keep --with-guile, but default to automagic selection. This makes - life easier for distributors, who can then rely on this if they know - they simply want to build against the guile version that is available by - default. - - https://bugzilla.gnome.org/show_bug.cgi?id=658159 - -diff --git a/configure.ac b/configure.ac -index 7b30bdb..3999330 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -520,23 +520,33 @@ GUILE_PKGS= - - AC_MSG_CHECKING([which guile version to use]) - AC_ARG_WITH([guile], -- [AS_HELP_STRING([--with-guile=1.8|2.0|2.2],[Which guile version to use (default: 1.8)])], -+ [AS_HELP_STRING([--with-guile=1.8|2.0|2.2|auto],[Which guile version to use (default: auto)])], - [case "$with_guile" in -- 1.8|2.0|2.2) ;; -+ 1.8|2.0|2.2|auto) ;; - *) AC_MSG_ERROR([unknown or unsupported guile version $with_guile specified]) ;; - esac], -- [with_guile=1.8]) -+ [with_guile=auto]) - AC_MSG_RESULT([$with_guile]) - - case "$with_guile" in -- 1.8) GUILE_PKGS="guile-1.8 >= $GUILE_1_8_REQUIRED" ;; -- 2.0) GUILE_PKGS="guile-2.0 >= $GUILE_2_0_REQUIRED" ;; -- 2.2) GUILE_PKGS="guile-2.2 >= $GUILE_2_2_REQUIRED" ;; -+ 1.8) AUTO_GUILE="false" GUILE_PKGS="guile-1.8 >= $GUILE_1_8_REQUIRED" ;; -+ 2.0) AUTO_GUILE="false" GUILE_PKGS="guile-2.0 >= $GUILE_2_0_REQUIRED" ;; -+ 2.2) AUTO_GUILE="false" GUILE_PKGS="guile-2.2 >= $GUILE_2_2_REQUIRED" ;; -+ auto) AUTO_GUILE="true" -+ PKG_CHECK_EXISTS([guile-2.2 >= $GUILE_2_2_REQUIRED], -+ [with_guile="2.2" GUILE_PKGS="guile-2.2 >= $GUILE_2_2_REQUIRED"], -+ [PKG_CHECK_EXISTS([guile-2.0 >= $GUILE_2_0_REQUIRED], -+ [with_guile="2.0" GUILE_PKGS="guile-2.0 >= $GUILE_2_0_REQUIRED"], -+ [PKG_CHECK_EXISTS([guile-1.8 >= $GUILE_1_8_REQUIRED], -+ [with_guile="1.8" GUILE_PKGS="guile-1.8 >= $GUILE_1_8_REQUIRED"], -+ [AC_MSG_ERROR([guile not found])])])]) ;; - esac - --PKG_CHECK_EXISTS([$GUILE_PKGS], -- [], -- [AC_MSG_ERROR([guile version $with_guile not found. Install it, or use --with-guile to select a different version.])]) -+if test "$auto_guile" != "true"; then -+ PKG_CHECK_EXISTS([$GUILE_PKGS], -+ [], -+ [AC_MSG_ERROR([guile version $with_guile not found. Install it, or use --with-guile to select a different version.])]) -+fi - - PKG_CHECK_MODULES([GUILE],[$GUILE_PKGS]) - diff --git a/aisleriot-fix-freecell-exception.patch b/aisleriot-fix-freecell-exception.patch deleted file mode 100644 index 588aeaf..0000000 --- a/aisleriot-fix-freecell-exception.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/games/freecell.scm 2011-06-06 14:23:03.000000000 -0500 -+++ b/games/freecell.scm 2011-11-28 11:08:14.000000000 -0600 -@@ -215,7 +215,7 @@ - (and (field-sequence? card-list) - (<= (length card-list) - (* (+ (empty-freecell-number) 1) -- ($expt 2 (max (- (empty-field-number) -+ (expt 2 (max (- (empty-field-number) - (if (empty-slot? field-id) 1 0) - (if (empty-slot? start-slot) 1 0)) - 0)))) diff --git a/aisleriot.changes b/aisleriot.changes index 65b67e6..2521285 100644 --- a/aisleriot.changes +++ b/aisleriot.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Dec 20 08:59:14 UTC 2011 - vuntz@opensuse.org + +- Update to version 3.3.1: + + Aisleriot now requires guile >= 2.0 + + Many improvements and bug fixes + + Updated translations. +- Add xz BuildRequires because we can't build a package for a + xz-compressed tarball without explicitly specifying that... See + bnc#697467 for more details. +- Remove pkgconfig(ice) and pkgconfig(sm) BuildRequires: removed + upstream. +- Really drop aisleriot-automagic-guile.patch. +- Drop aisleriot-fix-freecell-exception.patch: fixed upstream. + ------------------------------------------------------------------- Mon Nov 28 18:13:41 UTC 2011 - malcolmlewis@opensuse.org @@ -15,6 +30,7 @@ Mon Nov 21 16:37:03 UTC 2011 - dimstar@opensuse.org - Drop aisleriot-automagic-guile.patch: fixed upstream. - Remove gnome-common BuildRequires and call to gnome-autogen.sh as we don't carry any patch requiring this anymore. +- Pass --with-guile=auto to configure. ------------------------------------------------------------------- Tue Nov 15 10:09:11 UTC 2011 - vuntz@opensuse.org @@ -25,7 +41,7 @@ Tue Nov 15 10:09:11 UTC 2011 - vuntz@opensuse.org ------------------------------------------------------------------- Sun Nov 13 16:04:17 UTC 2011 - malcolmlewis@opensuse.org -- Add missing requires guile, game will not start without it +- Add missing guile Requires: game will not start without it (bnc#730053). ------------------------------------------------------------------- diff --git a/aisleriot.spec b/aisleriot.spec index 671bf44..fd7fea8 100644 --- a/aisleriot.spec +++ b/aisleriot.spec @@ -15,22 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: aisleriot -Version: 3.3.0 -Release: 1 +Version: 3.3.1 +Release: 0 # FIXME: the %%{_datadir}/help/$locale/ files should be found by %%find_lang -License: GPLv3+ Summary: Solitaire Card Games for GNOME -Url: http://www.gnome.org +License: GPL-3.0+ Group: Amusements/Games/Board/Card -Source0: http://download.gnome.org/sources/aisleriot/3.3/%{name}-%{version}.tar.bz2 +Url: http://www.gnome.org +Source0: http://download.gnome.org/sources/aisleriot/3.3/%{name}-%{version}.tar.xz # We add the 256x256 png icon for freecell from gnome-games version 2.91.3 # tarball manually until upstream solves bgo#657280 Source1: gnome-freecell.png -# PATCH-FIX-UPSTREAM aisleriot-fix-freecell-exception.patch bnc#730053, bgo#649730 malcolmlewis@opensuse.org -- Fix trying to make the first move in a freecell game generates an exception -Patch1: aisleriot-fix-freecell-exception.patch BuildRequires: guile-devel BuildRequires: intltool BuildRequires: itstool @@ -38,14 +34,14 @@ BuildRequires: lsb-release # Needed to get lsb data BuildRequires: dummy-release BuildRequires: update-desktop-files +# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 +BuildRequires: xz BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(librsvg-2.0) -BuildRequires: pkgconfig(sm) Requires: guile Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -56,9 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Aisleriot is a compilation of 80 different solitaire card games. %package themes -License: GPLv3+ Summary: Solitaire Card Games for GNOME -- Extra Themes -Group: Amusements/Games/Board/Card Requires: %{name} = %{version} Enhances: %{name} BuildArch: noarch @@ -71,7 +65,6 @@ This package provides extra themes for Aisleriot. %lang_package %prep %setup -q -%patch1 -p1 %build %configure \ @@ -130,6 +123,11 @@ sort -u %{name}.help-lang.tmp | grep -v "^%%lang(C)" >> %{name}.help-lang %{_datadir}/aisleriot/ %dir %{_libdir}/aisleriot %{_libdir}/aisleriot/ar-cards-renderer +%dir %{_libdir}/aisleriot/guile +%dir %{_libdir}/aisleriot/guile/2.0 +%dir %{_libdir}/aisleriot/guile/2.0/aisleriot +%{_libdir}/aisleriot/guile/2.0/aisleriot/api.go +%{_libdir}/aisleriot/guile/2.0/*.go %{_datadir}/glib-2.0/schemas/org.gnome.Patience.WindowState.gschema.xml %{_datadir}/icons/hicolor/*/apps/gnome-aisleriot.* %{_datadir}/icons/hicolor/*/apps/gnome-freecell.*