[batctl] make dependency on kmod conditional

Felix Kaechele heffer at fedoraproject.org
Mon Mar 2 05:54:49 UTC 2015


commit 98fa2d7e062b7778f36a044f7615a761c0b7576e
Author: Felix Kaechele <heffer at fedoraproject.org>
Date:   Mon Mar 2 06:54:06 2015 +0100

    make dependency on kmod conditional

 batctl.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/batctl.spec b/batctl.spec
index 29f56ea..96ebcd2 100644
--- a/batctl.spec
+++ b/batctl.spec
@@ -1,13 +1,17 @@
 Name:           batctl
 Version:        2014.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        B.A.T.M.A.N. advanced control and management tool
 
 License:        GPLv2
 URL:            http://www.open-mesh.org/
 Source0:        http://downloads.open-mesh.org/batman/stable/sources/batctl/%{name}-%{version}.tar.gz
 
+# Require the batman-adv kernel module for convenience here
+# It's not available on EL so make this conditional
+%if 0%{?fedora}
 Requires:       kmod(batman-adv.ko)
+%endif
 BuildRequires:  libnl3-devel
 
 %description
@@ -44,6 +48,9 @@ make %{?_smp_mflags} CFLAGS="%{optflags} -I%{_prefix}/include/libnl3" V=s
 
 
 %changelog
+* Mon Mar 02 2015 Felix Kaechele <heffer at fedoraproject.org> - 2014.4.0-2
+- make dependency on kmod conditional
+
 * Tue Feb 24 2015 Felix Kaechele <heffer at fedoraproject.org> - 2014.4.0-1
 - update to 2014.4.0
 - added dependency on kmod(batman-adv.ko) as batctl is useless without it


More information about the scm-commits mailing list