[nvidia-kmod] Add release tag to akmod build requires and obsoletes

commit de4591b9bf2862e8516237065376f23f3227062a Author: Leigh Scott <leigh123linux(a)googlemail.com&gt; Date: Thu Mar 21 09:07:10 2019 +0000 Add release tag to akmod build requires and obsoletes nvidia-kmod.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) --- diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec index 11810e8..d6a5224 100644 --- a/nvidia-kmod.spec +++ b/nvidia-kmod.spec @@ -10,7 +10,7 @@ Name: nvidia-kmod Epoch: 3 Version: 418.56 # Taken over by kmodtool -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA display driver kernel module License: Redistributable, no modification permitted URL: http://www.nvidia.com/ @@ -21,12 +21,12 @@ Source11: nvidia-kmodtool-excludekernel-filterfile ExclusiveArch: x86_64 # get the needed BuildRequires (in parts depending on what we build for) -%global AkmodsBuildRequires %{_bindir}/kmodtool, xorg-x11-drv-nvidia-kmodsrc >= %{epoch}:%{version} +%global AkmodsBuildRequires %{_bindir}/kmodtool, xorg-x11-drv-nvidia-kmodsrc >= %{epoch}:%{version}-%{release} BuildRequires: %{AkmodsBuildRequires} %{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} } # kmodtool does its magic here -%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{?epoch}:%{version}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{?epoch}:%{version}-%{release}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description The nvidia %{version} display driver kernel module for kernel %{kversion}. @@ -35,7 +35,7 @@ The nvidia %{version} display driver kernel module for kernel %{kversion}. # error out if there was something wrong with kmodtool %{?kmodtool_check} # print kmodtool output for debugging purposes: -kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{?epoch}:%{version}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{?epoch}:%{version}-%{release}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %setup -T -c tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz # patch loop @@ -66,6 +66,9 @@ done %changelog +* Thu Mar 21 2019 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 3:418.56-2 +- Add release tag to akmod build requires and obsoletes + * Thu Mar 21 2019 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 3:418.56-1 - Update to 418.56 release