Hello community, here is the log from the commit of package guile for openSUSE:Factory checked in at 2018-03-01 11:59:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/guile (Old) and /work/SRC/openSUSE:Factory/.guile.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guile" Thu Mar 1 11:59:52 2018 rev:53 rq:580993 version:2.0.14 Changes: -------- --- /work/SRC/openSUSE:Factory/guile/guile.changes 2017-09-15 23:05:23.479501641 +0200 +++ /work/SRC/openSUSE:Factory/.guile.new/guile.changes 2018-03-01 12:00:20.478180999 +0100 @@ -1,0 +2,21 @@ +Wed Feb 28 14:51:38 UTC 2018 - [email protected] + +- Add back the require on gc-devel as it is still needed for the + non .pc using packages (eg autotools) + +------------------------------------------------------------------- +Wed Feb 28 12:37:54 UTC 2018 - [email protected] + +- Add patch from Fedora not to link to libgc in all consumer libs: + * guile-2.0.14-gc_pkgconfig_private.patch +- Add _constraints file to ensure we can build properly + +------------------------------------------------------------------- +Wed Feb 28 12:35:01 UTC 2018 - [email protected] + +- Format with spec-cleaner +- Fix build with new glibc 2.27 bsc#1079837: + * guile-disable-int-tests.patch +- Use %license macro to install license + +------------------------------------------------------------------- New: ---- _constraints guile-2.0.14-gc_pkgconfig_private.patch guile-disable-int-tests.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ guile.spec ++++++ --- /var/tmp/diff_new_pack.y6A3bZ/_old 2018-03-01 12:00:21.698136985 +0100 +++ /var/tmp/diff_new_pack.y6A3bZ/_new 2018-03-01 12:00:21.698136985 +0100 @@ -1,7 +1,7 @@ # # spec file for package guile # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,25 +28,27 @@ Version: %{guilevers}.14 Release: 0 Summary: GNU's Ubiquitous Intelligent Language for Extension -License: GFDL-1.3 and GPL-3.0+ and LGPL-3.0+ +License: GFDL-1.3-only AND GPL-3.0-or-later AND LGPL-3.0-or-later Group: Development/Languages/Scheme -Url: https://www.gnu.org/software/guile/ +URL: https://www.gnu.org/software/guile/ Source0: https://ftp.gnu.org/gnu/guile/%{name}-%{version}.tar.xz Source1: https://ftp.gnu.org/gnu/guile/%{name}-%{version}.tar.xz.sig Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=guile&download=1#/%{name}.keyring Source3: guile-rpmlintrc # suse specific -Patch1: %{name}-64bit.patch -Patch2: %{name}-1.6.10-mktemp.patch -Patch3: %{name}-threads-test.patch -Patch4: %{name}-net-db-test.patch -BuildRequires: gc-devel +Patch1: guile-64bit.patch +Patch2: guile-1.6.10-mktemp.patch +Patch3: guile-threads-test.patch +Patch4: guile-net-db-test.patch +Patch5: guile-2.0.14-gc_pkgconfig_private.patch +Patch6: guile-disable-int-tests.patch BuildRequires: gmp-devel BuildRequires: libffi-devel BuildRequires: libltdl-devel BuildRequires: libunistring-devel BuildRequires: pkgconfig BuildRequires: readline-devel +BuildRequires: pkgconfig(bdw-gc) Requires(pre): fileutils Requires(pre): sh-utils @@ -57,7 +59,7 @@ %package -n libguile-%{gsuff} Summary: GNU's Ubiquitous Intelligent Language for Extension -License: GFDL-1.3 and GPL-3.0+ and LGPL-3.0+ +License: GFDL-1.3-only AND GPL-3.0-or-later AND LGPL-3.0-or-later Group: Development/Languages/Scheme Requires: %{name}-modules-%{guilemaj}_%{guilemin} >= %{version} # workaround for bnc#948804 @@ -71,7 +73,7 @@ %package modules-%{guilemaj}_%{guilemin} Summary: GNU's Ubiquitous Intelligent Language for Extension -License: GFDL-1.3 and GPL-3.0+ and LGPL-3.0+ +License: GFDL-1.3-only AND GPL-3.0-or-later AND LGPL-3.0-or-later Group: Development/Languages/Scheme %description modules-%{guilemaj}_%{guilemin} @@ -82,7 +84,7 @@ %package -n libguilereadline-%{greadsuff} Summary: GNU's Ubiquitous Intelligent Language for Extension -License: GFDL-1.3 and GPL-3.0+ and LGPL-3.0+ +License: GFDL-1.3-only AND GPL-3.0-or-later AND LGPL-3.0-or-later Group: Development/Languages/Scheme %description -n libguilereadline-%{greadsuff} @@ -93,9 +95,8 @@ %package devel Summary: GNU's Ubiquitous Intelligent Language for Extension -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Languages/Scheme -Requires: gc-devel Requires: gmp-devel # following Requires needed because /usr/bin/guile-config needs /usr/bin/guile Requires: guile = %{version} @@ -105,6 +106,7 @@ Requires: libunistring-devel Requires: ncurses-devel Requires: readline-devel +Requires: pkgconfig(bdw-gc) Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq} @@ -119,19 +121,19 @@ %patch2 %patch3 -p1 %patch4 -p1 -# force rebuild with non-broken makeinfo -#rm -f doc/*/*.info +%patch5 -p1 +%patch6 -p1 %build -# FIXME: Following files are apparently compiled without RPM_OPT_FLAGS: -# gen-scmconfig.c,c-tokenize.c - -%configure --disable-static --with-pic \ - --with-threads --disable-silent-rules +%configure \ + --disable-static \ + --with-pic \ + --with-threads \ + --disable-silent-rules make %{?_smp_mflags} %check -LD_LIBRARY_PATH="." make check +LD_LIBRARY_PATH="." make %{?_smp_mflags} check %install %make_install @@ -160,32 +162,28 @@ %postun -n libguilereadline-%{greadsuff} -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc ABOUT-NLS AUTHORS COPYING* ChangeLog GUILE-VERSION HACKING -%doc LICENSE NEWS README THANKS +%doc ABOUT-NLS AUTHORS ChangeLog GUILE-VERSION HACKING +%doc NEWS README THANKS %{_bindir}/guile-tools %{_bindir}/guild %{_bindir}/guile %{_mandir}/man1/guile.1%{ext_man} %files -n libguile-%{gsuff} -%defattr(-,root,root) +%license LICENSE COPYING* %{_libdir}/libguile-%{guilevers}.so.%{libgver}* %files modules-%{guilemaj}_%{guilemin} -%defattr(-,root,root) %{_libdir}/%{name} # Own usr/share/guile/site; side effect of not doing so is slib failing to install correctly. %{_datadir}/%{name} %files -n libguilereadline-%{greadsuff} -%defattr(-,root,root) # please leave .so file here [bnc#765436] %{_libdir}/libguilereadline-v-%{libgreadver}.so %{_libdir}/libguilereadline-v-%{libgreadver}.so.%{libgreadver}* %files devel -%defattr(-,root,root) %{_bindir}/guile-snarf %{_bindir}/guile-config %dir %{_includedir}/%{name} ++++++ _constraints ++++++ <constraints> <hardware> <memory> <size unit="G">2</size> </memory> </hardware> </constraints> ++++++ guile-2.0.14-gc_pkgconfig_private.patch ++++++ diff -up guile-2.0.14/meta/guile-2.0.pc.in.pkgconfig_private guile-2.0.14/meta/guile-2.0.pc.in --- guile-2.0.14/meta/guile-2.0.pc.in.pkgconfig_private 2016-12-14 18:03:33.000000000 -0600 +++ guile-2.0.14/meta/guile-2.0.pc.in 2018-02-20 11:53:56.344379283 -0600 @@ -21,9 +21,9 @@ guile=${bindir}/@guile@ Name: GNU Guile Description: GNU's Ubiquitous Intelligent Language for Extension Version: @GUILE_VERSION@ -Libs: -L${libdir} -lguile-@GUILE_EFFECTIVE_VERSION@ @BDW_GC_LIBS@ +Libs: -L${libdir} -lguile-@GUILE_EFFECTIVE_VERSION@ Libs.private: @LIB_CLOCK_GETTIME@ @LIBGMP@ @LIBLTDL@ @LIBFFI_LIBS@ \ @LIBUNISTRING@ @GUILE_LIBS@ @LIBICONV@ @LIBINTL@ @LIBSOCKET@ \ @SERVENT_LIB@ @HOSTENT_LIB@ @GETADDRINFO_LIB@ @INET_NTOP_LIB@ \ - @INET_PTON_LIB@ + @INET_PTON_LIB@ @BDW_GC_LIBS@ Cflags: -I${pkgincludedir}/@GUILE_EFFECTIVE_VERSION@ @GUILE_CFLAGS@ @BDW_GC_CFLAGS@ ++++++ guile-disable-int-tests.patch ++++++ Index: guile-2.0.14/test-suite/tests/i18n.test =================================================================== --- guile-2.0.14.orig/test-suite/tests/i18n.test +++ guile-2.0.14/test-suite/tests/i18n.test @@ -522,37 +522,7 @@ (pass-if-equal "positive inexact zero, 1 digit" "0.0" - (number->locale-string .0 1))) - - (with-test-prefix "French" - - (pass-if-equal "integer" - "123 456" - (under-french-locale-or-unresolved - (lambda () - (let ((fr (make-locale LC_ALL %french-locale-name))) - (number->locale-string 123456 #t fr))))) - - (pass-if-equal "negative integer" - "-1 234 567" - (under-french-locale-or-unresolved - (lambda () - (let ((fr (make-locale LC_ALL %french-locale-name))) - (number->locale-string -1234567 #t fr))))) - - (pass-if-equal "fraction" - "1 234,567" - (under-french-locale-or-unresolved - (lambda () - (let ((fr (make-locale LC_ALL %french-locale-name))) - (number->locale-string 1234.567 #t fr))))) - - (pass-if-equal "fraction, 1 digit" - "1 234,6" - (under-french-locale-or-unresolved - (lambda () - (let ((fr (make-locale LC_ALL %french-locale-name))) - (number->locale-string 1234.567 1 fr))))))) + (number->locale-string .0 1)))) (with-test-prefix "format ~h" @@ -560,16 +530,6 @@ ;; `locale-digit-grouping' defaults to '(); skip the tests in that ;; case. - (with-test-prefix "French" - - (pass-if-equal "12345.678" - "12 345,678" - (under-french-locale-or-unresolved - (lambda () - (if (null? (locale-digit-grouping %french-locale)) - (throw 'unresolved) - (format #f "~:h" 12345.678 %french-locale)))))) - (with-test-prefix "English" (pass-if-equal "12345.678" @@ -585,20 +545,6 @@ (with-test-prefix "French" - (pass-if-equal "integer" - "123 456,00 +EUR" - (under-french-locale-or-unresolved - (lambda () - (let ((fr (make-locale LC_ALL %french-locale-name))) - (monetary-amount->locale-string 123456 #f fr))))) - - (pass-if-equal "fraction" - "1 234,57 EUR " - (under-french-locale-or-unresolved - (lambda () - (let ((fr (make-locale LC_ALL %french-locale-name))) - (monetary-amount->locale-string 1234.567 #t fr))))) - (pass-if-equal "positive inexact zero" "0,00 +EUR" (under-french-locale-or-unresolved
