rpms/xorg-x11-drv-nvidia/devel 00-avoid-glamor.conf, NONE, 1.1 xorg-x11-drv-nvidia.spec, 1.120, 1.121

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31846

Modified Files:
	xorg-x11-drv-nvidia.spec 
Added Files:
	00-avoid-glamor.conf 
Log Message:
* Thu Nov 07 2013 Leigh Scott <leigh123linux at googlemail.com> - 1:331.20-2
- remove conflicts xorg-x11-glamor
- disable glamor module



--- NEW FILE 00-avoid-glamor.conf ---
#This file is provided by xorg-x11-drv-nvidia
#Do not edit

Section "Module"
Disable "glamoregl"
EndSection


Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- xorg-x11-drv-nvidia.spec	7 Nov 2013 01:17:31 -0000	1.120
+++ xorg-x11-drv-nvidia.spec	7 Nov 2013 14:09:54 -0000	1.121
@@ -8,7 +8,7 @@
 Name:            xorg-x11-drv-nvidia
 Epoch:           1
 Version:         331.20
-Release:         1%{?dist}
+Release:         2%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
 Group:           User Interface/X Hardware Support
@@ -19,6 +19,7 @@
 Source4:         ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Linux-armv7l-gnueabihf-%{version}.run
 Source2:         00-nvidia.conf
 Source3:         nvidia-xorg.conf
+Source5:         00-avoid-glamor.conf
 Source6:         blacklist-nouveau.conf
 
 BuildRequires:   desktop-file-utils
@@ -58,7 +59,6 @@
 Conflicts:       xorg-x11-drv-nvidia-173xx
 Conflicts:       xorg-x11-drv-fglrx
 Conflicts:       xorg-x11-drv-catalyst
-Conflicts:       xorg-x11-glamor
 
 
 #Support for cuda
@@ -217,6 +217,7 @@
 #Install static driver dependant configuration files
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
 install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
 sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
 touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
 install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
@@ -365,6 +366,7 @@
 %endif
 %dir %{_sysconfdir}/nvidia
 %config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+%config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
 %config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf
 %config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf
 %if 0%{?rhel} > 6 || 0%{?fedora} >= 15
@@ -434,6 +436,10 @@
 %{_libdir}/vdpau/libvdpau_nvidia.so
 
 %changelog
+* Thu Nov 07 2013 Leigh Scott <leigh123linux at googlemail.com> - 1:331.20-2
+- remove conflicts xorg-x11-glamor
+- disable glamor module
+
 * Thu Nov 07 2013 Leigh Scott <leigh123linux at googlemail.com> - 1:331.20-1
 - Update to 331.20
 - add conflicts xorg-x11-glamor