X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=zfs-modules.spec.in;h=220b1c11ed43b0e653dd774bc3cddce0c72d696d;hb=1c5de20ae2511124613926e4f780572634818218;hp=c1c1356490d0892eccf267fbeb080a74463c5d82;hpb=09559cdd150fa0b610dd4f816292fd90f50fd0cb;p=zfs.git

diff --git a/zfs-modules.spec.in b/zfs-modules.spec.in
index c1c1356..220b1c1 100644
--- a/zfs-modules.spec.in
+++ b/zfs-modules.spec.in
@@ -22,6 +22,28 @@
 %define kobj %{require_kobj}
 %endif
 
+# Set using 'rpmbuild ... --with debug ...', defaults to disabled.
+%if %{defined _with_debug}
+ %define kdebug --enable-debug
+%else
+ %if %{defined _without_debug}
+  %define kdebug --disable-debug
+ %else
+  %define kdebug --disable-debug
+ %endif
+%endif
+
+# Set using 'rpmbuild ... --with debug-dmu-tx ...', defaults to disabled.
+%if %{defined _with_debug_dmu_tx}
+ %define kdebug_dmu_tx --enable-debug-dmu-tx
+%else
+ %if %{defined _without_debug_dmu_tx}
+  %define kdebug_dmu_tx --disable-debug-dmu-tx
+ %else
+  %define kdebug_dmu_tx --disable-debug-dmu-tx
+ %endif
+%endif
+
 # SLES:
 %if %{defined suse_version}
  %if %{undefined kver}
@@ -198,20 +220,22 @@
 %define krequires        %{kpkg}
 %endif
 %define splrequires      %{splpkg}
+%define spldevrequires   %{spldevpkg}
 %else
 %define relext           %(echo %{kverpkg} | %{__sed} -e 's/-/_/g')
 %define release          @ZFS_META_RELEASE@_%{relext}
 %if %{defined kpkg}
 %define krequires        %{kpkg} %{koppkg} %{kverpkg}
 %endif
-%define splrequires      %{splpkg} = %{splverpkg}
+%define splrequires      %{splpkg} = %{splverpkg}_%{relext}
+%define spldevrequires   %{spldevpkg} = %{splverpkg}_%{relext}
 %endif
 
 Summary:         ZFS File System
 Group:           Utilities/System
 Name:            %{name}
 Version:         %{version}
-Release:         %{release}%{?dist}
+Release:         %{release}
 License:         @ZFS_META_LICENSE@
 URL:             git://github.com/zfsonlinux/zfs.git
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id} -un)
@@ -236,11 +260,10 @@ Group:           Development/Libraries
 %if %{defined krequires}
 Requires:        %{krequires}
 %endif
-Requires:        %{splrequires}
 %if %{defined kdevpkg}
-BuildRequires:   %{kdevpkg}
+Requires:        %{kdevpkg}
 %endif
-BuildRequires:   %{spldevpkg}
+Requires:        %{spldevrequires}
 
 %description devel
 The %{name}-devel package contains the kernel header files and 
@@ -252,7 +275,7 @@ which use %{name}.
 %build
 %configure --with-linux=%{kdir} --with-linux-obj=%{kobj} \
            --with-spl=%{spldir} --with-spl-obj=%{splobj} \
-           --with-config=kernel
+           --with-config=kernel %{kdebug} %{kdebug_dmu_tx}
 make
 
 %install