From 6c77da97efd3f09f10e31ade5ed040d4b8086acadf35f4a6e9b3faa0689fb785 Mon Sep 17 00:00:00 2001
From: Tomas Cech <sleep_walker@opensuse.org>
Date: Sun, 1 Nov 2015 17:38:30 +0000
Subject: [PATCH] - rename default group from guix-builders to guixbuild to
 match   upstream - install /gnu/store directory - depend on emacs, package
 emacs scripts

OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/guix?expand=0&rev=5
---
 guix.changes |  8 ++++++++
 guix.spec    | 12 +++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/guix.changes b/guix.changes
index 9f12e22..adc8602 100644
--- a/guix.changes
+++ b/guix.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Nov  1 08:17:51 UTC 2015 - sleep_walker@opensuse.org
+
+- rename default group from guix-builders to guixbuild to match
+  upstream
+- install /gnu/store directory
+- depend on emacs, package emacs scripts
+
 -------------------------------------------------------------------
 Thu Oct  1 21:18:37 UTC 2015 - sleep_walker@opensuse.org
 
diff --git a/guix.spec b/guix.spec
index 06f69dd..2f28b01 100644
--- a/guix.spec
+++ b/guix.spec
@@ -40,6 +40,7 @@ Source5:        mips64el-linux-%{guile}
 Source6:        armhf-linux-guile-2.0.11.tar.xz
 #Source10:       guixd.service
 Source11:       sysconfig.guix
+BuildRequires:  emacs-nox
 BuildRequires:  gcc-c++
 BuildRequires:  libgcrypt-devel
 BuildRequires:  pkgconfig
@@ -83,15 +84,18 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
 install -d -m 0755 %{buildroot}%{_localstatedir}/adm/fillup-templates/
 install -D -m 0644 -t %{buildroot}%{_localstatedir}/adm/fillup-templates/ %{SOURCE11}
 rm %{buildroot}%{_infodir}/dir
+install -d -m 0755 %{buildroot}/gnu
+install -d -m 0755 %{buildroot}/gnu/store
 %if ! %{systemd_present}
 rm -rvf %{buildroot}%{_unitdir}
 %endif
 
 %pre
-%{_sbindir}/groupadd -r guix-builders >/dev/null 2>/dev/null || :
+%{_sbindir}/groupadd -r guixbuild >/dev/null 2>/dev/null || :
 for i in `seq 1 5`; do
-    %{_sbindir}/useradd -r -o -g guix-builders -G guix-builders -u $((60+$i)) -c "Guix builder $i" \
-                  -s /sbin/nologin -d %{_localstatedir}/empty guix-builder$i 2> /dev/null || :
+    %{_sbindir}/useradd -r -o -g guixbuild -G guixbuild \
+        -u $((60+$i)) -c "Guix builder $i" -s /sbin/nologin \
+        -d %{_localstatedir}/empty guix-builder$i 2> /dev/null || :
 done
 %if %{systemd_present}
 %service_add_pre guix-daemon.service
@@ -120,6 +124,7 @@ done
 %{_sysconfdir}/bash_completion.d/guix
 %{_datadir}/guile
 %{_datadir}/guix
+%{_datadir}/emacs/site-lisp/guix*
 %{_bindir}/guix*
 %{_sbindir}/guix*
 %{_libexecdir}/guix
@@ -131,5 +136,6 @@ done
 %endif
 %{_mandir}/man1/guix*
 %{_localstatedir}/adm/fillup-templates/*
+/gnu
 
 %changelog