- release 6 (by relup.sh)

[packages/zfs.git] / zfs.spec

diff --git a/zfs.spec b/zfs.spec
index 2f62bf65e4608dcfe687f133917fec440fb61217..79ea525ab9913639cf080a27e802dd206838c8ef 100644 (file)
--- a/zfs.spec
+++ b/zfs.spec
@@ -27,7 +27,7 @@ exit 1
 
 %define                _duplicate_files_terminate_build        0
 
-%define        rel     3
+%define        rel     6
 %define        pname   zfs
 Summary:       Native Linux port of the ZFS filesystem
 Summary(pl.UTF-8):     Natywny linuksowy port systemu plików ZFS
@@ -258,6 +258,8 @@ p=`pwd`\
        --with-linux=%{_kernelsrcdir} \
        --with-systemdunitdir=%{systemdunitdir} \
        --with-systemdpresetdir=/etc/systemd/system-preset \
+       --with-systemdmodulesloaddir=/etc/modules-load.d \
+       --with-systemdgeneratordir=/lib/systemd/system-generators \
        --with-udevdir=/lib/udev
 
 %{__make} \
@@ -276,6 +278,8 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with kernel}
 install -d $RPM_BUILD_ROOT
 cp -a installed/* $RPM_BUILD_ROOT
+# Drop unneeded spl compat links
+%{__rm} -r $RPM_BUILD_ROOT/usr/src/spl-%{version}
 %endif
 
 %if %{with userspace}
@@ -299,9 +303,6 @@ cd ../..
 install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
 %{__mv} $RPM_BUILD_ROOT%{_npkgconfigdir}/* $RPM_BUILD_ROOT%{_pkgconfigdir}
 
-# Drop unneeded spl compat links
-%{__rm} -r /usr/src/spl-%{version}
-
 # Debian specific stuff
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/initramfs-tools
 
@@ -349,9 +350,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(754,root,root) /etc/rc.d/init.d/zfs-zed
 %config(noreplace) %verify(not md5 mtime size) /etc/default/zfs
 /etc/zfs/zfs-functions
-/usr/lib/modules-load.d/zfs.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/zfs.conf
 /etc/systemd/system-preset/50-zfs.preset
-/usr/lib/systemd/system-generators/zfs-mount-generator
+/lib/systemd/system-generators/zfs-mount-generator
 %{systemdunitdir}/zfs.target
 %{systemdunitdir}/zfs-import.target
 %{systemdunitdir}/zfs-import-cache.service