Hello community, here is the log from the commit of package aisleriot for openSUSE:Factory checked in at Mon Sep 5 16:14:54 CEST 2011.
-------- --- aisleriot/aisleriot.changes 2011-08-24 23:59:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/aisleriot/aisleriot.changes 2011-09-05 09:37:59.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Sep 4 08:04:02 UTC 2011 - [email protected] + +- 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. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- aisleriot-automagic-guile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aisleriot.spec ++++++ --- /var/tmp/diff_new_pack.iz9YtA/_old 2011-09-05 16:14:22.000000000 +0200 +++ /var/tmp/diff_new_pack.iz9YtA/_new 2011-09-05 16:14:22.000000000 +0200 @@ -19,7 +19,7 @@ Name: aisleriot Version: 3.1.1 -Release: 1 +Release: 2 License: GPLv3+ Summary: Solitaire Card Games for GNOME Url: http://www.gnome.org @@ -30,6 +30,10 @@ Source1: gnome-freecell.png # PATCH-FIX-UPSTREAM aisleriot-theme-install.patch bgo#648601 [email protected] -- Let aisleriot know that extra themes are in aisleriot-themes Patch0: aisleriot-theme-install.patch +# PATCH-FIX-UPSTREAM aisleriot-automagic-guile.patch bgo#658159 [email protected] -- 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 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build +# needed by patch1 +NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-schemas-install \ --disable-static \ ++++++ aisleriot-automagic-guile.patch ++++++ commit 3223853fcb8f519d7736d13bd8c30da6434d8cef Author: Vincent Untz <[email protected]> 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]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
