Accepting request 655868 from home:jbrielmaier:branches:devel:languages:misc

- update to version 0.16

OBS-URL: https://build.opensuse.org/request/show/655868
OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guix?expand=0&rev=26
This commit is contained in:
Jonathan Brielmaier
2018-12-06 18:43:06 +00:00
committed by Git OBS Bridge
parent 703bb2d15c
commit 59f9ee6a3f
9 changed files with 69 additions and 164 deletions

View File

@@ -19,7 +19,7 @@
%define guile guile-2.0.9.tar.xz
%define guix_builder_group guixbuild
Name: guix
Version: 0.15.0
Version: 0.16.0
Release: 0
Summary: GNU Package manager
License: GPL-3.0-only
@@ -44,15 +44,11 @@ Source12: aarch64-linux-guile-2.0.14.tar.xz
Source13: aarch64-linux-guile-2.0.14.tar.xz.sig
Source20: run_guix_daemon.sh
Source21: run_guix_publish.sh
# In the release tarball these two patches missing, leading to errors in guix weather
# and guix challenge. Upstream: 57ac5261fec345b16cf80f87aa03212abc2c5a11
Source30: perl-text-markdown-discount-unbundle.patch
Source31: racket-fix-xform-issue.patch
Patch0: 0001-gnu-local.mk-Add-missing-patches.patch
BuildRequires: gcc-c++
BuildRequires: gnutls-guile
BuildRequires: guile-charting
BuildRequires: guile-devel >= 2.0
BuildRequires: guile-gcrypt
BuildRequires: guile-git
BuildRequires: guile-json
BuildRequires: guile-sqlite3
@@ -66,12 +62,10 @@ BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(gnutls)
BuildRequires: pkgconfig(sqlite3)
# Needed for creating the Makefile including the two missing patches
BuildRequires: automake
BuildRequires: help2man
BuildRequires: makeinfo
Requires: gnutls-guile
Requires: guile
Requires: guile-gcrypt
Requires: guile-git
Requires: guile-json
Requires: guile-sqlite3
Requires: guile-ssh-devel
@@ -86,9 +80,6 @@ Purely functional package manager and a distribution thereof.
%prep
%setup -q
# Create the Makefile including two missing patches
%patch0 -p1
./bootstrap
# 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
@@ -97,9 +88,6 @@ cp %{SOURCE4} gnu/packages/bootstrap/x86_64-linux/%{guile}
cp %{SOURCE5} gnu/packages/bootstrap/mips64el-linux/%{guile}
cp %{SOURCE6} gnu/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz
cp %{SOURCE12} gnu/packages/bootstrap/aarch64-linux/guile-2.0.14.tar.xz
# copy the patches to correct location
cp %{SOURCE30} gnu/packages/patches
cp %{SOURCE31} gnu/packages/patches
%build
export GUILE_WARN_DEPRECATED
@@ -142,8 +130,9 @@ done
%install_info --info-dir=%{_infodir} %{_infodir}/guix.info.gz
%service_add_post guix-daemon.service
%service_add_post guix-publish.service
# Authorize official key of Guix build farm to enable binary substitutes
# Authorize official keys of Guix build farm to enable binary substitutes
guix archive --authorize < %{_datadir}/guix/hydra.gnu.org.pub
guix archive --authorize < %{_datadir}/guix/ci.guix.info.pub
%postun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/guix.info.gz
@@ -168,7 +157,6 @@ guix archive --authorize < %{_datadir}/guix/hydra.gnu.org.pub
%{_infodir}/images
%{_libdir}/guile/*
%{_libexecdir}/guix
%{_libexecdir}/guix-authenticate
%{_mandir}/man1/guix*
%{_unitdir}/guix*.service
%attr(755,root,root) %dir /gnu