[ndiswrapper-kmod/el7: 31/31] Merge branch 'master' into el7

commit 2cc0495c8c246f9257aae384de8f2ef54278d58f Merge: 0f662fd 70d01e7 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Wed Jun 28 10:12:34 2017 +0200 Merge branch 'master' into el7 .gitignore | 2 +- ndiswrapper-4.7-kernel.patch | 13 +++ ndiswrapper-kmod.spec | 199 +++++++++---------------------------------- sources | 2 +- 4 files changed, 57 insertions(+), 159 deletions(-) --- diff --cc ndiswrapper-kmod.spec index 6251a3f,cba6389..4a13041 --- a/ndiswrapper-kmod.spec +++ b/ndiswrapper-kmod.spec @@@ -3,12 -3,17 +3,15 @@@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed - %global buildforkernels current + %if 0%{?fedora} + %global buildforkernels akmod + %global debug_package %{nil} + %endif -#global pre rc1 - Summary: Ndiswrapper kernel module Name: ndiswrapper-kmod - Version: 1.59 - Release: 7%{?dist} + Version: 1.61 + Release: 1%{?pre}%{?dist} License: GPLv2 Group: System Environment/Kernel URL: http://ndiswrapper.sourceforge.net