pool/aisleriot
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 80904 from GNOME:Factory

Browse Source 
fix looks good to have

OBS-URL: https://build.opensuse.org/request/show/80904
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aisleriot?expand=0&rev=6
This commit is contained in:
Lars Vogdt 2011-09-05 14:14:46 +00:00 committed by Git OBS Bridge
commit b1c0910eb9
3 changed files with 76 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
aisleriot-automagic-guile.patch Normal file
View File

@ -0,0 +1,60 @@
commit 3223853fcb8f519d7736d13bd8c30da6434d8cef
Author: Vincent Untz <vuntz@gnome.org>
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])

9
aisleriot.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sun Sep 4 08:04:02 UTC 2011 - vuntz@opensuse.org
- Add aisleriot-automagic-guile.patch: make detection of guile
version automatic by default, to avoid having to specify it in
configure.
- Add gnome-common BuildRequires and call to gnome-autogen.sh for
above patch.
-------------------------------------------------------------------
Wed Aug 24 21:57:56 UTC 2011 - badshah400@gmail.com

7
aisleriot.spec
View File

@ -30,6 +30,10 @@ Source0: http://download.gnome.org/sources/aisleriot/3.1/%{name}-%{versio
Source1: gnome-freecell.png
# PATCH-FIX-UPSTREAM aisleriot-theme-install.patch bgo#648601 vuntz@opensuse.org -- Let aisleriot know that extra themes are in aisleriot-themes
Patch0: aisleriot-theme-install.patch
# PATCH-FIX-UPSTREAM aisleriot-automagic-guile.patch bgo#658159 vuntz@opensuse.org -- Automatically detect version of guile
Patch1: aisleriot-automagic-guile.patch
# needed by patch1
BuildRequires: gnome-common
BuildRequires: gnome-doc-utils-devel
BuildRequires: guile-devel
BuildRequires: intltool
@ -70,8 +74,11 @@ This package provides extra themes for Aisleriot.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
# needed by patch1
NOCONFIGURE=1 gnome-autogen.sh
%configure \
--disable-schemas-install \
--disable-static \