Hello community, here is the log from the commit of package guix for openSUSE:Factory checked in at 2018-06-02 12:08:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/guix (Old) and /work/SRC/openSUSE:Factory/.guix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guix" Sat Jun 2 12:08:32 2018 rev:8 rq:612682 version:0.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/guix/guix.changes 2018-04-03 12:12:29.890524798 +0200 +++ /work/SRC/openSUSE:Factory/.guix.new/guix.changes 2018-06-02 12:08:32.735918065 +0200 @@ -1,0 +2,8 @@ +Mon May 28 13:29:04 UTC 2018 - [email protected] + +- add gnutls-fix.patch + GnuTLS built against guile 2.0 is breaking any HTTPS connection, + this upstream patch solves it +- put COPYING as %license in specfile + +------------------------------------------------------------------- New: ---- gnutls-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ guix.spec ++++++ --- /var/tmp/diff_new_pack.QNfiFA/_old 2018-06-02 12:08:34.667847208 +0200 +++ /var/tmp/diff_new_pack.QNfiFA/_new 2018-06-02 12:08:34.667847208 +0200 @@ -45,6 +45,8 @@ Source12: aarch64-linux-guile-2.0.14.tar.xz Source13: aarch64-linux-guile-2.0.14.tar.xz.sig Source20: run_guix_daemon.sh +# PATCH-FIX-UPSTREAM -- HTTPS is not working correctly for GnuTLS built against Guile 2.0 -- [email protected] +Patch0: https://git.savannah.gnu.org/cgit/guix.git/patch/?id=7f04197fef905790fd392f8d686d00ae95a0d04c#./gnutls-fix.patch BuildRequires: gcc-c++ BuildRequires: gnutls-guile BuildRequires: guile-charting @@ -74,6 +76,7 @@ %prep %setup -q +%patch0 -p1 # install service file to _unitdir sed -i 's@\$(libdir)/systemd/system@%{_unitdir}@' Makefile.in mkdir -p gnu/packages/bootstrap/{i686,x86_64,mips64el,armhf}-linux @@ -135,7 +138,8 @@ %files -f %{name}.lang -f guix-packages.lang %defattr(-,root,root) -%doc COPYING README +%license COPYING +%doc README # bash completion script is not configuration file but who would argue # with RPM lint :b %{_sysconfdir}/bash_completion.d/guix ++++++ gnutls-fix.patch ++++++ >From 7f04197fef905790fd392f8d686d00ae95a0d04c Mon Sep 17 00:00:00 2001 From: Eric Bavier <[email protected]> Date: Mon, 4 Dec 2017 10:33:31 -0600 Subject: utils: Fix cond-expand for Guile 2.0. * guix/build/download.scm (tls-wrap): Use 'guile-2.2' feature instead. --- guix/build/download.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/build/download.scm b/guix/build/download.scm index 4490d22..609a100 100644 --- a/guix/build/download.scm +++ b/guix/build/download.scm @@ -308,10 +308,10 @@ host name without trailing dot." (register-tls-record-port record port) ;; Write HTTP requests line by line rather than byte by byte: - ;; <https://bugs.gnu.org/22966>. This is not possible on Guile 2.0. + ;; <https://bugs.gnu.org/22966>. This is possible with Guile >= 2.2. (cond-expand - (guile-2.0 #f) - (else (setvbuf record 'line))) + (guile-2.2 (setvbuf record 'line)) + (else #f)) record))) -- cgit v1.0-41-gc330
