guix: Guix 0.8.2 -> 0.8.3

2 files changed, 45 insertions, 21 deletions

diff --git a/guix/guix/guix.service b/guix/guix/guix.service
deleted file mode 100644
index 7804793..0000000
--- a/guix/guix/guix.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=GNU Guix package manager
-
-[Service]
-ExecStart=/usr/bin/guix-daemon --build-users-group=guix-builder
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/guix/guix/guix.spec b/guix/guix/guix.spec
index 142f58a..adb4b18 100644
--- a/guix/guix/guix.spec
+++ b/guix/guix/guix.spec
@@ -1,18 +1,17 @@
 Name:       guix
-Version:    0.8.2
-Release:    3%{?dist}
+Version:    0.8.3
+Release:    1%{?dist}
 Summary:    a purely functional package manager for the GNU system
 
 Group:      System Environment/Base
 License:    GPLv3+
 URL:        https://www.gnu.org/software/guix
 Source0:    ftp://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
-Source1:    guix.service
 
-%global guile_required    5:2.0.5
+%global guile_required    5:2.0.7
 %global sqlite_required   3.6.19
-%global guix_user         guix-builder
-%global guix_group        guix-builder
+%global guix_user         guixbuild
+%global guix_group        guixbuild
 %global completionsdir    %(pkg-config --variable=completionsdir bash-completion)
 
 BuildRequires: guile-devel >= %{guile_required}
@@ -25,9 +24,11 @@ BuildRequires: systemd
 
 Requires:   guile >= %{guile_required}
 Requires:   sqlite >= %{sqlite_required}
-Requires:   bzip2, libgcrypt
+Requires:   gzip, bzip2, xz, libgcrypt
 Requires(post):  /usr/sbin/useradd
+Requires(post):  /usr/sbin/usermod
 Requires(post):  /usr/sbin/groupadd
+Requires(post):  /usr/sbin/groupmod
 Requires(post):  /usr/bin/gpasswd
 Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -67,12 +68,15 @@ Source for Emacs interface for GNU Guix.
 make %{?_smp_mflags}
 
 %check
+# Remove the check that don't work because of depending on external resources
+sed -i 's|tests/builders.scm||' Makefile
+# Using user namespaces in mock is not allowed
+sed -i 's|tests/syscalls.scm||' Makefile
+sed -i 's|tests/containers.scm||' Makefile
 make %{?_smp_mflags} check
 
 %install
-make install DESTDIR=%{buildroot}
-mkdir -p %{buildroot}%{_unitdir}
-install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/guix.service
+make install DESTDIR=%{buildroot} systemdservicedir=%{_unitdir}
 %{_emacs_bytecompile} %{buildroot}%{_emacs_sitelispdir}/guix*.el
 %find_lang guix
 %find_lang guix-packages
@@ -84,6 +88,9 @@ if [ "$1" = 1 ]; then
     /usr/sbin/useradd -M -N -g %{guix_group} -d /gnu/store -s /sbin/nologin \
         -c "Guix build user" %{guix_user}
     /usr/bin/gpasswd -a %{guix_user} %{guix_group} >/dev/null
+elif [ "$1" -gt 1 ]; then
+    /usr/sbin/groupmod -n %{guix_group} guix-builder 2>/dev/null || :
+    /usr/sbin/usermod -l %{guix_user} -d /gnu/store guix-builder 2>/dev/null || :
 fi
 
 %preun
@@ -163,9 +170,27 @@ fi
 %{_datadir}/guile/site/2.0/guix/build-system/*.go
 %{_infodir}/%{name}.info*
 %{_infodir}/images/bootstrap-graph.png.gz
+%{_infodir}/images/coreutils-size-map.png.gz
 %exclude %{_infodir}/dir
+%{_mandir}/man1/guix-archive.1.gz
+%{_mandir}/man1/guix-build.1.gz
+%{_mandir}/man1/guix-daemon.1.gz
+%{_mandir}/man1/guix-download.1.gz
+%{_mandir}/man1/guix-edit.1.gz
+%{_mandir}/man1/guix-environment.1.gz
+%{_mandir}/man1/guix-gc.1.gz
+%{_mandir}/man1/guix-hash.1.gz
+%{_mandir}/man1/guix-import.1.gz
+%{_mandir}/man1/guix-lint.1.gz
+%{_mandir}/man1/guix-package.1.gz
+%{_mandir}/man1/guix-publish.1.gz
+%{_mandir}/man1/guix-pull.1.gz
+%{_mandir}/man1/guix-refresh.1.gz
+%{_mandir}/man1/guix-size.1.gz
+%{_mandir}/man1/guix-system.1.gz
+%{_mandir}/man1/guix.1.gz
 %{completionsdir}/guix
-%{_unitdir}/guix.service
+%{_unitdir}/guix-daemon.service
 
 %files emacs
 %{_emacs_sitelispdir}/guix*.elc
@@ -174,6 +199,15 @@ fi
 %{_emacs_sitelispdir}/guix*.el
 
 %changelog
+* Thu Jul 23 2015 Ting-Wei Lan <lantw44@gmail.com> - 0.8.3-1
+- Update to 0.8.3
+- Remove checks that depend on missing remote resources
+- Remove checks that are not allowed to run in mock
+- Remove the systemd service file written by me. Upstream already provides a
+  better systemd service file.
+- Rename guix-builder group to guixbuild, which is the default of guix-daemon
+  and upstream systemd service file.
+
 * Thu May 21 2015 Ting-Wei Lan <lantw44@gmail.com> - 0.8.2-3
 - We no longer have to create /gnu/store and /var/log/guix manually. Guix can
   create and set correct permissions for these directories.