- 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
This commit is contained in:
Tomas Cech 2015-11-01 17:38:30 +00:00 committed by Git OBS Bridge
parent 460caabcec
commit 6c77da97ef
2 changed files with 17 additions and 3 deletions

View File

@ -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 Thu Oct 1 21:18:37 UTC 2015 - sleep_walker@opensuse.org

View File

@ -40,6 +40,7 @@ Source5: mips64el-linux-%{guile}
Source6: armhf-linux-guile-2.0.11.tar.xz Source6: armhf-linux-guile-2.0.11.tar.xz
#Source10: guixd.service #Source10: guixd.service
Source11: sysconfig.guix Source11: sysconfig.guix
BuildRequires: emacs-nox
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libgcrypt-devel BuildRequires: libgcrypt-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -83,15 +84,18 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
install -d -m 0755 %{buildroot}%{_localstatedir}/adm/fillup-templates/ install -d -m 0755 %{buildroot}%{_localstatedir}/adm/fillup-templates/
install -D -m 0644 -t %{buildroot}%{_localstatedir}/adm/fillup-templates/ %{SOURCE11} install -D -m 0644 -t %{buildroot}%{_localstatedir}/adm/fillup-templates/ %{SOURCE11}
rm %{buildroot}%{_infodir}/dir rm %{buildroot}%{_infodir}/dir
install -d -m 0755 %{buildroot}/gnu
install -d -m 0755 %{buildroot}/gnu/store
%if ! %{systemd_present} %if ! %{systemd_present}
rm -rvf %{buildroot}%{_unitdir} rm -rvf %{buildroot}%{_unitdir}
%endif %endif
%pre %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 for i in `seq 1 5`; do
%{_sbindir}/useradd -r -o -g guix-builders -G guix-builders -u $((60+$i)) -c "Guix builder $i" \ %{_sbindir}/useradd -r -o -g guixbuild -G guixbuild \
-s /sbin/nologin -d %{_localstatedir}/empty guix-builder$i 2> /dev/null || : -u $((60+$i)) -c "Guix builder $i" -s /sbin/nologin \
-d %{_localstatedir}/empty guix-builder$i 2> /dev/null || :
done done
%if %{systemd_present} %if %{systemd_present}
%service_add_pre guix-daemon.service %service_add_pre guix-daemon.service
@ -120,6 +124,7 @@ done
%{_sysconfdir}/bash_completion.d/guix %{_sysconfdir}/bash_completion.d/guix
%{_datadir}/guile %{_datadir}/guile
%{_datadir}/guix %{_datadir}/guix
%{_datadir}/emacs/site-lisp/guix*
%{_bindir}/guix* %{_bindir}/guix*
%{_sbindir}/guix* %{_sbindir}/guix*
%{_libexecdir}/guix %{_libexecdir}/guix
@ -131,5 +136,6 @@ done
%endif %endif
%{_mandir}/man1/guix* %{_mandir}/man1/guix*
%{_localstatedir}/adm/fillup-templates/* %{_localstatedir}/adm/fillup-templates/*
/gnu
%changelog %changelog