Fix the RPM build

1 files changed, 4 insertions, 12 deletions

diff --git a/nix.spec.in b/nix.spec.in
index 8f5df9241a..f067c3896f 100644
--- a/nix.spec.in
+++ b/nix.spec.in
@@ -117,19 +117,14 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-# Fix symlink: we want to link to the versioned soname, not to the
-# unversioned one that'd be put in -devel
-pushd $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Nix/Store
-ln -sf %{_libdir}/nix/libNixStore.so.0 Store.so
-popd
-
 # Specify build users group
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nix
 echo "build-users-group = %{nixbld_group}" > $RPM_BUILD_ROOT%{_sysconfdir}/nix/nix.conf
 
 # make per-user directories
 for d in profiles gcroots;
 do
-  mkdir $RPM_BUILD_ROOT/nix/var/nix/$d/per-user
+  mkdir -p $RPM_BUILD_ROOT/nix/var/nix/$d/per-user
   chmod 1777 $RPM_BUILD_ROOT/nix/var/nix/$d/per-user
 done
 
@@ -149,7 +144,7 @@ cp -p misc/systemd/nix-daemon.service \
 cp -p misc/emacs/nix-mode.elc $RPM_BUILD_ROOT%{_emacs_sitelispdir}/
 
 # we ship this file in the base package
-rm $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/README
+rm -f $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/README
 
 
 %clean
@@ -176,10 +171,8 @@ systemctl start  nix-daemon.service
 %endif
 
 %files
-%doc COPYING AUTHORS README
 %{_bindir}/nix-*
-%dir %{_libdir}/nix
-%{_libdir}/nix/*.so.*
+%{_libdir}/*.so
 %{perl_vendorarch}/*
 %exclude %dir %{perl_vendorarch}/auto/
 %{_prefix}/libexec/*
@@ -198,7 +191,6 @@ systemctl start  nix-daemon.service
 
 %files devel
 %{_includedir}/nix
-%{_libdir}/nix/*.so
 
 %files doc
 %docdir %{_defaultdocdir}/%{name}-doc-%{version}