[xorg-x11-drv-nvidia] fix last commit
by Leigh Scott
commit 12830ee924e1a2f21146eed4a9885f7bdb20598e
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jan 18 14:24:04 2017 +0000
fix last commit
xorg-x11-drv-nvidia.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 44cb06a..3c28723 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -612,6 +612,8 @@ fi ||:
%{_nvidia_libdir}/libnvidia-eglcore.so
%if 0%{?fedora}
%{_nvidia_libdir}/libnvidia-egl-wayland.so
+%else
+%exclude %{_nvidia_libdir}/libnvidia-egl-wayland.so
%endif
%{_nvidia_libdir}/libnvidia-fbc.so
%{_nvidia_libdir}/libnvidia-glcore.so
7 years, 3 months
[xorg-x11-drv-nvidia/el7: 2/2] Merge branch 'master' into el7
by Leigh Scott
commit 7ad0d08823f81a6babdb9893d7fd181688aaa5d7
Merge: d6faf2f 9bb7058
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jan 18 14:18:59 2017 +0000
Merge branch 'master' into el7
xorg-x11-drv-nvidia.spec | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
---
7 years, 3 months
[xorg-x11-drv-nvidia] Add conditions for el7 as there is no wayland
by Leigh Scott
commit 9bb7058670f250f441d344ef9c249abb901d096a
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jan 18 14:18:21 2017 +0000
Add conditions for el7 as there is no wayland
xorg-x11-drv-nvidia.spec | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 1856bf4..44cb06a 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -14,7 +14,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 375.26
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -539,6 +539,9 @@ fi ||:
%ghost %{_sysconfdir}/prelink.conf.d/nvidia-%{_lib}.conf
%{_nvidia_libdir}/alternate-install-present
%{_nvidia_libdir}/*.so.*
+%if 0%{?rhel}
+%exclude %{_nvidia_libdir}/libnvidia-egl-wayland.so.*
+%endif
%exclude %{_nvidia_libdir}/libcuda.so*
%exclude %{_nvidia_libdir}/libnvidia-gtk*.so*
%exclude %{_nvidia_libdir}/libnvcuvid.so*
@@ -607,13 +610,18 @@ fi ||:
%{_nvidia_libdir}/libGLESv1_CM_nvidia.so
%{_nvidia_libdir}/libGLESv2_nvidia.so
%{_nvidia_libdir}/libnvidia-eglcore.so
+%if 0%{?fedora}
%{_nvidia_libdir}/libnvidia-egl-wayland.so
+%endif
%{_nvidia_libdir}/libnvidia-fbc.so
%{_nvidia_libdir}/libnvidia-glcore.so
%{_nvidia_libdir}/libnvidia-glsi.so
%{_nvidia_libdir}/libGLX_nvidia.so
%changelog
+* Wed Jan 18 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:375.26-10
+- Add conditions for el7 as there is no wayland
+
* Wed Jan 18 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:375.26-9
- Add conditions for f24 and el7
7 years, 3 months
[nvidia-kmod/el7] clean sources
by Leigh Scott
commit 6786c4a5743951685fbfab35a2ac78e456482a0d
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jan 18 13:31:55 2017 +0000
clean sources
sources | 4 ----
1 file changed, 4 deletions(-)
---
diff --git a/sources b/sources
index 7f959aa..e69de29 100644
--- a/sources
+++ b/sources
@@ -1,4 +0,0 @@
-<<<<<<< HEAD
-7c9823a01dbbffca386a8e399997addc nvidia-kmod-data-331.113.tar.xz
-=======
->>>>>>> master
7 years, 3 months
[nvidia-kmod/el7: 106/106] fix merge
by Leigh Scott
commit 8967f85b82ceb7859347ca34d70f21e6643819c6
Merge: 155ce9c e9bdd6f
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jan 18 13:28:34 2017 +0000
fix merge
.gitignore | 2 +-
3.18_kernel.patch | 23 ---
3.19_kernel.patch | 40 ----
4.0.0_kernel.patch | 28 ---
nv-linux-arm.patch | 10 +-
nv-linux-arm2.patch | 12 ++
nvidia-kmod.spec | 307 ++++++++++++++-----------------
nvidia-kmodtool-excludekernel-filterfile | 2 +-
sources | 3 +
9 files changed, 162 insertions(+), 265 deletions(-)
---
diff --cc sources
index fbfb0c3,e69de29..7f959aa
--- a/sources
+++ b/sources
@@@ -1,1 -1,0 +1,4 @@@
++<<<<<<< HEAD
+7c9823a01dbbffca386a8e399997addc nvidia-kmod-data-331.113.tar.xz
++=======
++>>>>>>> master
7 years, 3 months
[nvidia-kmod/el7] (106 commits) ...fix merge
by Leigh Scott
Summary of changes:
959be75... * Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
10bfed8... * Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
61d7062... * Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
fb1fcb5... * Tue Jan 21 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
dcc40dd... Disable uvm - simplify patch (*)
ca14fd4... * Sat Feb 08 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
9a6c9af... more patch tweaks (*)
52e65d4... * Mon Mar 03 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
ab02155... * Tue Apr 08 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
685c014... Avoid to build on arm lpae (*)
5637f26... * Sat Apr 26 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
aa6b8d6... * Sat Apr 26 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
89f1c75... Update to kmodsrc scheme (*)
98252ea... * Sat May 31 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
2137674... * Thu Jun 05 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
fb4be2b... * Mon Jun 09 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
f3f4ec0... Add epoch to require (*)
2677f19... * Tue Jul 08 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
41c84cc... * Thu Aug 07 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
8ffc495... * Thu Aug 07 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
8c0be29... * Fri Sep 19 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
c9d00da... * Tue Oct 21 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
9062024... * Tue Oct 21 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
896e5dc... * Fri Dec 05 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
2bb166d... * Sun Dec 14 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
bf511b4... * Tue Dec 16 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
bc4e5e5... redo patch (*)
fca38f0... * Fri Dec 19 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
9ce23e0... current (*)
16d95e3... * Sat Jan 10 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
e127be4... * Thu Jan 15 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
dcd3dff... * Fri Jan 16 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
bd22f7e... * Fri Jan 16 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
300fc91... * Fri Jan 16 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
0881b7f... * Fri Jan 16 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
aed8dfa... * Fri Jan 16 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
0b05d06... * Wed Jan 21 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
6f796ab... * Mon Feb 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
bee4115... * Wed Feb 04 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
b899391... * Sun Feb 08 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
015e506... * Sat Feb 14 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
4a571bb... * Tue Feb 24 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
1b6ee2a... * Tue Feb 24 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
84a137f... * Tue Feb 24 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
a6c5c5d... * Fri Mar 06 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
b67ce35... * Tue Mar 10 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
09457a7... * Fri Mar 13 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
112479e... * Sat Mar 21 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
7eebfae... * Mon Mar 23 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
e7d1637... * Fri Mar 27 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
7e866ca... * Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
441222d... * Wed Apr 08 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
a3ccb66... * Wed Apr 08 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
8e59ca1... * Wed Apr 15 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
7d22946... * Wed Apr 22 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
f9c203a... * Sat May 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
c3b2e42... * Sat May 09 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
33e2044... * Wed May 13 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
2f0e976... * Wed May 20 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
73b5912... * Wed May 20 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
8df47c3... Rebuilt (*)
3373823... * Sun May 24 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
c2d3037... * Tue Jun 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
05e7b51... * Wed Jun 10 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
c799cb9... * Mon Jun 15 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
a1a52c4... * Sun Jun 28 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
787e9ab... * Thu Jul 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
bcc933d... * Thu Jul 16 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
0a09f91... * Fri Jul 24 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
af0f482... Update to latest (*)
4e6da8a... * Wed Jul 29 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
484381b... Fix build on arm (*)
9093b2c... * Thu Jul 30 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
4c8b8e3... * Fri Aug 07 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
6b8e8d9... * Thu Aug 13 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
501d399... * Fri Aug 21 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
cc36e92... * Fri Aug 28 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
827850b... * Mon Aug 31 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
0c01961... * Mon Sep 14 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
a420990... * Wed Sep 16 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
e9d1538... Build for current (*)
63a374f... * Wed Sep 23 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
84cb884... * Tue Oct 06 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
1e40bb3... * Fri Nov 06 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
ee5af81... * Fri Nov 13 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3 (*)
0518860... Update to latest upstream (*)
0c0d3e4... Update latest release (*)
fae4e52... Fixup patch (*)
17fdda7... Update to 367.27 (*)
c5d2cc0... Avoid armhfp for now (*)
2a4cf50... Revert "Avoid armhfp for now" (*)
bba03e6... patch for 4.7rc kernel (*)
52cadb0... switch to akmods build (*)
61d8b51... use akmod instead (*)
9e3a705... fix build (*)
7fff178... fix build (*)
9613f98... Update to 367.35 (*)
7ce154e... patch for 4.8rc kernel (*)
358ee8e... Update to 370.23 beta (*)
43277aa... Update to 367.44 (*)
c39036f... Update to 370.28 (*)
332a4cb... fix merge (*)
847e626... Update to 375.10 beta release (*)
ab65b90... Update to 375.20 (*)
e9bdd6f... Update to 375.26 (*)
8967f85... fix merge
(*) This commit already existed in another branch; no separate mail sent
7 years, 3 months
[xorg-x11-drv-nvidia/el7: 105/105] fix merge
by Leigh Scott
commit d6faf2f7ff3dc737de61d695f53ea40e83c56c75
Merge: 7e89de0 75e76f9
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jan 18 12:58:14 2017 +0000
fix merge
.gitignore | 24 +-
00-ignoreabi.conf | 4 +
nvidia-old.conf | 8 +
nvidia-snapshot.sh | 7 -
nvidia.conf | 17 ++
parse-readme.py | 61 ++++
sources | 6 +-
xorg-x11-drv-nvidia.metainfo.xml | 36 +++
xorg-x11-drv-nvidia.spec | 615 +++++++++++++++++++++++++++++----------
9 files changed, 611 insertions(+), 167 deletions(-)
---
7 years, 3 months
[xorg-x11-drv-nvidia/el7] (105 commits) ...fix merge
by Leigh Scott
Summary of changes:
237ad3d... * Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
46249a1... * Sat Feb 08 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
d820dc4... * Sat Feb 08 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
2f6812d... * Mon Mar 03 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
4391f5f... * Tue Apr 08 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
daa51bf... * Tue May 06 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
391f8a4... - Provides libcuda.so in -libs rhbz#2979 - Split modules co (*)
8fb8df8... * Sat May 31 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
c3824ad... make changes to snapshot tool (*)
0959223... * Wed Jun 04 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
3890c01... fix sources (*)
7a8a502... * Mon Jun 09 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
06f44a2... * Mon Jul 07 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
a6e9143... * Tue Jul 08 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
8d4d271... * Thu Aug 07 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
1c53ea1... Preliminary split for cuda sub-package (*)
b0854b9... Move cuda tools into a cuda subpackage (*)
7d39bfe... Add systemd units macros since fedora 18 (*)
34ddccb... Add conflicts for 340xx (*)
d99a670... Conflicts 340xx for -cuda (*)
9067b6f... Update description (*)
bb7e676... Exclude vendor provided OpenCL.so, we can use fedora one (*)
5430322... Move nvcuvid nvidia-encode into cuda (*)
21a04cc... Re-ordering (*)
6f5eb29... Simplify filter_setup (*)
0cd2e5a... Add outputclass support (*)
ba09f9a... Add nvidia compiler and opencl to -cuda (*)
4599906... Move opencl icd to the configuration (*)
3744d5d... Avoid prelink to mess with nvidia libs - rfbz#3258 (*)
a7b434b... Update changelog (*)
6672e06... Fix bz (*)
9ea73fc... Fixup (*)
73256cd... Add libnvidia-ml to the -cuda subpackage (*)
a32c363... Update changlog (*)
4ad65be... * Fri Sep 19 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
8b64a2f... Fixup (*)
9d40311... Fix prelink hack (*)
9e9101d... Switch libnvidia-ml back to multilibs (*)
00b9fd9... Fixup (*)
fea1838... * Tue Dec 16 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
31f0a62... - Move libnvidia-ml back into -cuda along with nvidia-debug (*)
cf8ad5c... Fixup nvidia.icd perm (*)
b9932ad... * Fri Jan 16 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
f259922... * Wed Jan 21 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
6b10566... Add cuda-driver-devel and %{_isa} virtual provides (*)
9cf22a5... Fix package on armhfp (*)
79e59f7... * Tue Feb 24 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
5d8cf6c... * Wed Apr 08 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
dc3d2b7... * Wed May 20 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
df7a0ab... * Mon Jun 15 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
bd2d984... * Tue Jul 28 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
083700b... * Fri Aug 28 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
ac95b5d... * Mon Aug 31 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
72ae0ec... Update to latest upstream (*)
1194dbe... Fix GFXPAYLOAD on EFI (*)
7c2bc9b... Update to 367.27 (*)
9e00d61... Update to 367.27 (*)
aba02dc... Add vulkan icd profile (*)
a8a1ef2... remove uneeded libvdpau excludes (*)
324940e... no vulkan on arm (*)
ed392b8... fix (*)
6719b37... Update to 367.35 (*)
91ebfb5... small fix to libs install (*)
d0d08f1... Move setttings libs to libs sub-package rfbz#3998 (*)
ccbe8c4... Revert "Move setttings libs to libs sub-package rfbz#3998" (*)
f029d66... Revert last commit (*)
1b6e42a... add ldconfig in %%post and %%postun for main package rfbz#3 (*)
41a0a92... Fix duplicate lib (*)
8e67369... move some more cuda libs (*)
c3441e3... Update to 370.23 beta (*)
fd75400... Update to 367.44 (*)
78f133d... Update to 370.28 (*)
0890182... glvnd lib needed for non-glvnd setup (*)
7ed2449... fix merge (*)
12dec79... fix gitignore (*)
3af5c0c... add xorg abi override (*)
0079640... add xorg abi override (*)
bed268e... fix source number (*)
6cdb041... fix override file (*)
d11d966... edit changelog (*)
e6141b3... Merge branch 'master' into f25 (*)
e02f136... fix missing % (*)
01510f4... Merge branch 'master' into f25 (*)
6ecfbc0... Switch to system libglvnd (*)
62bcab1... Add libglvnd path to ld.so.conf.d conf file (*)
99add75... readd description (*)
2e7b89b... Update to 375.10 beta release (*)
9e01fee... /etc/glvnd/egl_vendor.d/10_nvidia.json (*)
c8a9eb7... Add glvnd/egl_vendor.d file (*)
c329399... Update to 375.20 (*)
c0605a9... Update to 375.26 release (*)
20f9b84... Change conf files for Prime support (*)
ae4b9c7... remove file (*)
7d312c4... Fix nvidia.conf (*)
c9c60e0... Add conditionals for f24 (*)
0807a51... Add xorg-x11-server-Xorg minimum version requires for F25 a (*)
3f492e5... Fix error in nvidia.conf rfbz#4388 (*)
836186e... Update nvidia.conf for latest Xorg changes (*)
ad8a614... revert leftover from some testing (*)
19ec459... Changes for mesa glvnd (*)
3cfcb55... add missing python2 buildrequires (*)
a0ba7b9... add python version to shebang (*)
c20013d... Add conditions for f24 and el7 (*)
75e76f9... Fix missing el7 conditional (*)
d6faf2f... fix merge
(*) This commit already existed in another branch; no separate mail sent
7 years, 3 months
[xorg-x11-drv-nvidia] Fix missing el7 conditional
by Leigh Scott
commit 75e76f98063392596cdc2a7277ab57970cf940d7
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jan 18 12:53:18 2017 +0000
Fix missing el7 conditional
xorg-x11-drv-nvidia.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 76bea97..1856bf4 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -513,7 +513,7 @@ fi ||:
%{_nvidia_libdir}/libnvidia-gtk3.so*
%endif
#/no_multilib
-%if 0%{?fedora} >= 21
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 21
%{_datadir}/X11/xorg.conf.d/nvidia.conf
%endif
%if 0%{?fedora} >= 25
7 years, 3 months