$ git diff --patch-with-stat --summary 7564c7b7fea8cfb9edfda5cbeff70c87475988a6..614b8d89f691b009221b7fe56e87d833c0d7e3a2

 mesa.spec | 38 +++++++-------------------------------
 1 file changed, 7 insertions(+), 31 deletions(-)

diff --git a/mesa.spec b/mesa.spec
index 1da8e28..9c32eae 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -30,7 +30,6 @@
 %bcond_without wayland
 %bcond_without egl
 %bcond_without opencl
-%bcond_without tfloat
 %ifarch %arm mips sparc aarch64
 %bcond_with intel
 %else
@@ -115,8 +114,6 @@
 %define libwaylandegl	%mklibname %{waylandeglname} %{waylandeglmajor}
 %define devwaylandegl	%mklibname %{waylandeglname} -d
 
-%define libvadrivers	%mklibname va-drivers
-
 %define mesasrcdir	%{_prefix}/src/Mesa/
 %define driver_dir	%{_libdir}/dri
 
@@ -152,7 +149,7 @@ Summary:	OpenGL %{opengl_ver} compatible 3D graphics library
 Name:		mesa
 Version:	17.3.2
 %if "%{relc}%{git}" == ""
-Release:	1
+Release:	3
 %else
 %if "%{relc}" != ""
 %if "%{git}" != ""
@@ -313,7 +310,7 @@ DRI and XvMC drivers.
 Summary:	DRI Drivers for AMD/ATI Radeon graphics chipsets
 Group:		System/Libraries
 Conflicts:	%{mklibname dri-drivers} < 9.1.0-0.20130130.2
-Conflicts:	libva-vdpau-driver
+Conflicts:	libva-vdpau-driver  < 17.3.0
 %define __noautoreq '.*llvmradeon.*'
 
 %description -n %{dridrivers}-radeon
@@ -331,7 +328,7 @@ DRI and XvMC drivers for VMWare guest Operating Systems.
 %package -n	%{dridrivers}-intel
 Summary:	DRI Drivers for Intel graphics chipsets
 Group:		System/Libraries
-Conflicts:	libva-vdpau-driver
+Conflicts:	libva-vdpau-driver < 17.3.0
 Conflicts:	%{mklibname dri-drivers} < 9.1.0-0.20130130.2
 
 %description -n %{dridrivers}-intel
@@ -341,8 +338,7 @@ DRI and XvMC drivers for Intel graphics chipsets
 %package -n	%{dridrivers}-nouveau
 Summary:	DRI Drivers for NVIDIA graphics chipsets using the Nouveau driver
 Group:		System/Libraries
-Conflicts:	libva-vdpau-driver
-
+Conflicts:	libva-vdpau-driver < 17.3.0
 Conflicts:	%{mklibname dri-drivers} < 9.1.0-0.20130130.2
 
 %description -n %{dridrivers}-nouveau
@@ -423,23 +419,10 @@ Requires:	%{libosmesa} = %{version}-%{release}
 This package contains the headers needed to compile programs against
 the Mesa offscreen rendering library.
 
-%if %{with va}
-%package -n	%{libvadrivers}
-Summary:	Mesa libVA video acceleration drivers
-Group:		System/Libraries
-
-%description -n %{libvadrivers}
-Mesa is an OpenGL %{opengl_ver} compatible 3D graphics library.
-libVA drivers for video acceleration
-%endif
-
 %package -n	%{libgl}
 Summary:	Files for Mesa (GL and GLX libs)
 Group:		System/Libraries
 Suggests:	%{dridrivers} >= %{version}-%{release}
-%if %{with tfloat}
-Requires:	%mklibname txc-dxtn
-%endif
 Obsoletes:	%{_lib}mesagl1 < %{version}-%{release}
 Requires:	%{_lib}udev1
 
@@ -646,7 +629,6 @@ Development files for the OpenCL library
 Summary:	Mesa VDPAU drivers
 Group:		System/Libraries
 Requires:	%{dridrivers} = %{EVRD}
-%if %{with vdpau}
 %ifnarch %{armx}
 Requires:	%{_lib}vdpau-driver-nouveau
 Requires:	%{_lib}vdpau-driver-r300
@@ -656,7 +638,6 @@ Requires:	%{_lib}vdpau-driver-r600
 %endif
 %endif
 Requires:	%{_lib}vdpau-driver-softpipe
-%endif
 Provides:	vdpau-drivers = %{EVRD}
 
 %description -n %{vdpaudrivers}
@@ -868,10 +849,7 @@ GALLIUM_DRIVERS="$GALLIUM_DRIVERS,freedreno,vc4,etnaviv,pl111,imx"
 	--disable-llvm \
 	--with-gallium-drivers=swrast \
 %endif
-%if %{with tfloat}
-	--enable-texture-float  \
-%endif
-	# end of configure options
+	--enable-texture-float
 
 %if %{with osmesa}
 # Build OSMesa separately, since we want to build OSMesa without shared-glapi,
@@ -1039,10 +1017,6 @@ find %{buildroot} -name '*.la' |xargs rm -f
 %{_libdir}/pkgconfig/osmesa.pc
 %endif
 
-%if %{with va}
-%files -n %{libvadrivers}
-%endif
-
 %files -n %{libgl}
 %{_libdir}/libGL.so.*
 %dir %{_libdir}/mesa
@@ -1134,6 +1108,8 @@ find %{buildroot} -name '*.la' |xargs rm -f
 
 #vdpau enblaed
 %if %{with vdpau}
+%files -n %{vdpaudrivers}
+
 %files -n %{_lib}vdpau-driver-nouveau
 %{_libdir}/vdpau/libvdpau_nouveau.so.*