Cleanly remove spl-modules-devel headers

Add the /usr/src/spl-<version>-<release>/<kernel> directory to
the spl-modules-devel package.  This ensures that this directory
will be removed when the package is removed.

We do not include the higher level /usr/src/spl-<version>-<release>
directory since there may be builds for multiple kernels.  Instead,
a %postun rmdir is added which attempts to remove this directory.
It will only succeed when the last spl-modules-devel-* package
for this specific release is removed.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/spl-modules.spec.in b/spl-modules.spec.in
index 044225098d66145942f4ba53f96e43fdc6826338..d1315a27b165162f85675e266c446bfa8a4b9693 100644 (file)
--- a/spl-modules.spec.in
+++ b/spl-modules.spec.in
@@ -497,7 +497,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
-%{_prefix}/src/*/%{kver_kern}/*
+%{_prefix}/src/*/%{kver_kern}
 
 %post
 if [ -f /boot/System.map-%{kver_kern} ]; then
@@ -513,6 +513,10 @@ else
        /sbin/depmod -a || exit 0
 fi
 
+%postun devel
+rmdir %{_prefix}/src/@PACKAGE@-%{version}-@SPL_META_RELEASE@ 2>/dev/null
+exit 0
+
 %endif
 %if %{?with_kernel_debug}
 
@@ -522,7 +526,7 @@ fi
 
 %files debug-devel
 %defattr(-,root,root)
-%{_prefix}/src/*/%{kver_dbug}/*
+%{_prefix}/src/*/%{kver_dbug}
 
 %post debug
 if [ -f /boot/System.map-%{kver_dbug} ]; then
@@ -538,12 +542,16 @@ else
        /sbin/depmod -a || exit 0
 fi
 
+%postun debug-devel
+rmdir %{_prefix}/src/@PACKAGE@-%{version}-@SPL_META_RELEASE@ 2>/dev/null
+exit 0
+
 %endif
 %if %{?with_kernel_dkms}
 
 %files dkms
 %defattr(-,root,root)
-%{_prefix}/src/@PACKAGE@-%{version}/*
+%{_prefix}/src/@PACKAGE@-%{version}
 
 %post dkms
 for POSTINST in %{_prefix}/lib/dkms/common.postinst; do