- change ownership of /gnu/store

- remove sysconfig.guix file as it is not used anymore
- define macro %guix_builder_group to make such changes in future
  easier

OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/guix?expand=0&rev=6

guix.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Nov  4 17:40:58 UTC 2015 - sleep_walker@opensuse.org
+
+- change ownership of /gnu/store
+- remove sysconfig.guix file as it is not used anymore
+- define macro %guix_builder_group to make such changes in future
+  easier
+
 -------------------------------------------------------------------
 Sun Nov  1 08:17:51 UTC 2015 - sleep_walker@opensuse.org
 

guix.spec

@@ -18,6 +18,7 @@
 # if there is systemd present, systemd_requires is defined
 %define systemd_present %{defined systemd_requires}
 %define guile	guile-2.0.9.tar.xz
+%define guix_builder_group	guixbuild
 
 Name:           guix
 Version:        0.8.3
@@ -38,8 +39,6 @@ Source4:        x86_64-linux-%{guile}
 Source5:        mips64el-linux-%{guile}
 # http://alpha.gnu.org/gnu/guix/bootstrap/armhf-linux/20150101/guile-2.0.11.tar.xz
 Source6:        armhf-linux-guile-2.0.11.tar.xz
-#Source10:       guixd.service
-Source11:       sysconfig.guix
 BuildRequires:  emacs-nox
 BuildRequires:  gcc-c++
 BuildRequires:  libgcrypt-devel
@@ -81,8 +80,6 @@ make %{?_smp_mflags}
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 %find_lang %{name}
 %find_lang guix-packages
-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
@@ -91,9 +88,9 @@ rm -rvf %{buildroot}%{_unitdir}
 %endif
 
 %pre
-%{_sbindir}/groupadd -r guixbuild >/dev/null 2>/dev/null || :
+%{_sbindir}/groupadd -r %{guix_builder_group} >/dev/null 2>/dev/null || :
 for i in `seq 1 5`; do
-    %{_sbindir}/useradd -r -o -g guixbuild -G guixbuild \
+    %{_sbindir}/useradd -r -o -g %{guid_builder_group} -G %{guix_builder_group} \
         -u $((60+$i)) -c "Guix builder $i" -s /sbin/nologin \
         -d %{_localstatedir}/empty guix-builder$i 2> /dev/null || :
 done
@@ -107,7 +104,6 @@ done
 
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/guix.info.gz
-%{fillup_only guixd}
 %if %{systemd_present}
 %service_add_post guix-daemon.service
 %endif
@@ -135,7 +131,7 @@ done
 %{_unitdir}/guix*.service
 %endif
 %{_mandir}/man1/guix*
-%{_localstatedir}/adm/fillup-templates/*
-/gnu
+%attr(755,root,root) %dir /gnu
+%attr(775,root,%{guix_builder_group}) %dir /gnu/store
 
 %changelog

sysconfig.guix

@@ -1,5 +0,0 @@
-# name of group where guix builders would belong to
-GUIX_BUILDER_GROUP="guix-builders"
-
-# number of cores used for guix builders
-GUIX_BUILDER_CORES="0"