Hello community, here is the log from the commit of package guile-parted for openSUSE:Factory checked in at 2020-01-21 21:01:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/guile-parted (Old) and /work/SRC/openSUSE:Factory/.guile-parted.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guile-parted" Tue Jan 21 21:01:05 2020 rev:3 rq:765947 version:0.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/guile-parted/guile-parted.changes 2020-01-03 17:37:22.335307612 +0100 +++ /work/SRC/openSUSE:Factory/.guile-parted.new.26092/guile-parted.changes 2020-01-21 21:01:29.076880258 +0100 @@ -1,0 +2,8 @@ +Mon Jan 13 22:47:18 UTC 2020 - Jonathan Brielmaier <[email protected]> + +- Add patch: + * support-guile-3.0.patch: Add support for Guile 3.0. Proposed to + upstream. +- Remove unrecognized configure flag. + +------------------------------------------------------------------- New: ---- support-guile-3.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ guile-parted.spec ++++++ --- /var/tmp/diff_new_pack.4d41mS/_old 2020-01-21 21:01:30.476880911 +0100 +++ /var/tmp/diff_new_pack.4d41mS/_new 2020-01-21 21:01:30.508880925 +0100 @@ -1,7 +1,7 @@ # # spec file for package guile-parted # -# 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 @@ -25,6 +25,8 @@ URL: https://gitlab.com/mothacehe/guile-parted Source0: https://gitlab.com/mothacehe/%{name}/-/archive/%{version}/%{name}-%{version}.tar.gz Source1: guile-parted-rpmlintrc +# Support Guile 3.0. Patch proposed upstream in https://gitlab.com/mothacehe/guile-parted/merge_requests/1 +Patch0: support-guile-3.0.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: guile-bytestructures @@ -40,10 +42,11 @@ %prep %setup -q +%patch0 -p1 %build ./bootstrap -%configure --disable-static +%configure make %{?_smp_mflags} %install ++++++ support-guile-3.0.patch ++++++ commit 4f50322ead596bbd96f8a40286390a9ef9a23f1d (HEAD -> add-guile-3.0-support, origin/add-guile-3.0-support) Author: Jonathan Brielmaier <[email protected]> Date: Mon Jan 13 23:44:37 2020 +0100 Add support for Guile 3.0. * configure.ac (GUILE_PKG): Add Guile 3.0. * m4/guile.m4 (GUILE_PROGS): Add proper support for Guile 3.0 beta releases (2.9.x). Inspired by commit 9d7a1dd at guile-ssh. Signed-off-by: Jonathan Brielmaier <[email protected]> diff --git a/configure.ac b/configure.ac index 56344c2..911a285 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign color-tests]) dnl Enable silent rules by default. AM_SILENT_RULES([yes]) -GUILE_PKG([2.2 2.0]) +GUILE_PKG([3.0 2.2 2.0]) GUILE_PROGS dnl (srfi srfi-64) appeared in Guile 2.0.11. diff --git a/m4/guile.m4 b/m4/guile.m4 index 9fd4f1a..31698c3 100644 --- a/m4/guile.m4 +++ b/m4/guile.m4 @@ -241,6 +241,9 @@ AC_DEFUN([GUILE_PROGS], else as_fn_error $? "Guile $_guile_required_version required, but $_guile_prog_version found" "$LINENO" 5 fi + elif test "$GUILE_EFFECTIVE_VERSION" = "$_major_version.$_minor_version" -a -z "$_micro_version"; then + # Allow prereleases that have the right effective version. + true else AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found]) fi
