rpms/nvidia-340xx-kmod/F-20 nvidia-340xx-kmod.spec,1.1,1.2

[Przemysław Palacz]

Author: przemal

Update of /cvs/nonfree/rpms/nvidia-340xx-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32593

Modified Files:
	nvidia-340xx-kmod.spec 
Log Message:
* Thu Jan 15 2015 Przemysław Palacz <pprzemal at gmail.com> - 1:340.65-3
- Replace main nvidia driver in F20 with this legacy version
- Remove deprecated BuildRoot tag



Index: nvidia-340xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-340xx-kmod/F-20/nvidia-340xx-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-340xx-kmod.spec	12 Jan 2015 00:54:10 -0000	1.1
+++ nvidia-340xx-kmod.spec	16 Jan 2015 19:01:12 -0000	1.2
@@ -9,7 +9,7 @@
 Epoch:         1
 Version:       340.65
 # Taken over by kmodtool
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       NVIDIA display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -20,8 +20,6 @@
 Patch1:        3.18_kernel.patch
 Patch2:        3.19_kernel.patch
 
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 # needed for plague to make sure it builds for i586 and i686
 ExclusiveArch:  i686 x86_64 armv7hl
 
@@ -31,7 +29,7 @@
 
 %{!?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} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
+%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} %(if [ 0%{?fedora} == 020 ]; then echo --obsolete-name nvidia --obsolete-version %{?epoch}:%{version}-%{release}; fi) 2>/dev/null) }
 
 %description
 The nvidia %{version} display driver kernel module for kernel %{kversion}.
@@ -41,7 +39,11 @@
 # 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} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
+kmodtool  --target %{_target_cpu}  --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} \
+%if 0%{?fedora} == 20
+    --obsolete-name nvidia --obsolete-version %{?epoch}:%{version}-%{release} \
+%endif
+2>/dev/null
 %setup -T -c
 tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
 # patch loop
@@ -89,6 +91,10 @@
 
 
 %changelog
+* Thu Jan 15 2015 Przemysław Palacz <pprzemal at gmail.com> - 1:340.65-3
+- Replace main nvidia driver in F20 with this legacy version
+- Remove deprecated BuildRoot tag
+
 * Sat Jan 10 2015 Przemysław Palacz <pprzemal at gmail.com> - 1:340.65-2
 - Bring back part of the old patch for kernel 3.18
 - Patch for kernel 3.19 (no longer marks the kernel as tainted, GPL only interfaces)