[telegram-desktop/f26] Updated to 1.2.15.
by Vitaly Zaitsev
commit a8ae1e80ec080c0971d26fffe15e6616c905c8ca
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Mon Mar 26 19:53:46 2018 +0200
Updated to 1.2.15.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fixes.patch | 2 +-
telegram-desktop.spec | 5 ++++-
4 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e4b8894..939d5f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@
/tdesktop-1.2.12.tar.gz
/tdesktop-1.2.13.tar.gz
/tdesktop-1.2.14.tar.gz
+/tdesktop-1.2.15.tar.gz
diff --git a/sources b/sources
index fcbb42b..11e2199 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ed3d3121418d32866ae348ce75042770 crl-344cbde.tar.gz
-7e2bad54b30df1a0087839354f7646c6 tdesktop-1.2.14.tar.gz
+da99c1885b82b26be5e267bff1aef34d tdesktop-1.2.15.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index b42e125..876ef5e 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From ce108dbe0cb55dc26cbb7538ee27d1985665aae4 Mon Sep 17 00:00:00 2001
+From 01a3a6c8ca41a2c163d3065666dc5e78eb622880 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri, 31 Mar 2017 14:29:58 +0200
Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock.
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 3265753..91bca2b 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -10,7 +10,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.2.14
+Version: 1.2.15
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -136,6 +136,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Mon Mar 26 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.15-1
+- Updated to 1.2.15.
+
* Thu Mar 22 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.14-1
- Updated to 1.2.14.
6 years, 1 month
[xorg-x11-drv-nvidia/el7: 4/4] Merge branch 'master' into el7
by Leigh Scott
commit f2b6a17b704549f37598337b78101cefb4b4a1b3
Merge: e724f0f 697c040
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Mar 26 12:41:54 2018 +0100
Merge branch 'master' into el7
xorg-x11-drv-nvidia.metainfo.xml | 2 +-
xorg-x11-drv-nvidia.spec | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
---
6 years, 1 month
[xorg-x11-drv-nvidia] Use a better fix el7 build
by Leigh Scott
commit 697c040e6d6d913ed5c879affd14576cd0c42816
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Mar 26 12:24:21 2018 +0100
Use a better fix el7 build
xorg-x11-drv-nvidia.spec | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 6e8bbb1..e8cb89f 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -301,6 +301,11 @@ install -p -m 0644 nvidia.icd %{buildroot}%{_sysconfdir}/OpenCL/vendors/
sed -i -e 's|__NV_VK_ICD__|libGLX_nvidia.so.0|' nvidia_icd.json.template
install -m 0755 -d %{buildroot}%{_datadir}/vulkan/icd.d/
install -p -m 0644 nvidia_icd.json.template %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
+%if 0%{?rhel}
+# back to non-glvnd version for vulkan
+sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
+touch -r nvidia_icd.json.template %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
+%endif
%endif
# EGL config for libglvnd
@@ -360,9 +365,6 @@ install -pm 0644 %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE5} %{buildroot}%{_datadir}/X11/xorg.conf.d
sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
touch -r %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
-# back to non-glvnd version for vulkan
-sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
-touch -r nvidia_icd.json.template %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
%endif
#Ghost Xorg nvidia.conf files
touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
@@ -481,12 +483,12 @@ fi ||:
# Owns the directory since libglvnd is optional here
%dir %{_datadir}/glvnd
%dir %{_datadir}/glvnd/egl_vendor.d
-%{_datadir}/X11/xorg.conf.d/00-avoid-glamor.conf
-%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
# RHEL6 uses /etc
%if 0%{?rhel} == 6
%config(noreplace) %{_modprobe_d}/blacklist-nouveau.conf
%config(noreplace) %{_dracut_conf_d}/99-nvidia-dracut.conf
+%{_datadir}/X11/xorg.conf.d/00-avoid-glamor.conf
+%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
%else
%{_modprobe_d}/blacklist-nouveau.conf
%{_dracut_conf_d}/99-nvidia-dracut.conf
6 years, 1 month
[xorg-x11-drv-nvidia] Revert "Fix el7 build"
by Nicolas Chauvet
commit 1d54ce108f3a2b8af48e027f86ce74379aa5a71f
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Mar 26 12:25:16 2018 +0200
Revert "Fix el7 build"
This reverts commit 4bf52ce4761ca376776f61eac41523338434ab66.
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 4c3a287..6e8bbb1 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -350,7 +350,7 @@ install -p -m 0644 nvidia-application-profiles-%{version}-{rc,key-documentation}
#Install the Xorg configuration files
mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
mkdir -p %{buildroot}%{_datadir}/X11/xorg.conf.d
-%if 0%{?fedora} >= 25 || 0%{?rhel} >= 8
+%if 0%{?fedora} >= 25 || 0%{?rhel} >= 7
install -pm 0644 %{SOURCE10} %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
touch -r %{SOURCE10} %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
6 years, 1 month
[xorg-x11-drv-nvidia] Update contact
by Nicolas Chauvet
commit 9c402962ce5d3c245929c52d7e6c06e10bd6d20c
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Mar 23 12:44:41 2018 +0100
Update contact
xorg-x11-drv-nvidia.metainfo.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.metainfo.xml b/xorg-x11-drv-nvidia.metainfo.xml
index 519aa6a..1ac86f3 100644
--- a/xorg-x11-drv-nvidia.metainfo.xml
+++ b/xorg-x11-drv-nvidia.metainfo.xml
@@ -32,5 +32,5 @@
<keyword>OpenGL</keyword>
</keywords>
<url type="bugtracker">https://bugzilla.rpmfusion.org</url>
- <update_contact>xorg-x11-drv-nvidia(a)rpmfusion.org</update_contact>
+ <update_contact>xorg-x11-drv-nvidia-owner(a)rpmfusion.org</update_contact>
</component>
6 years, 1 month
[xorg-x11-drv-nvidia/el7: 33/33] Merge branch 'master' into el7
by Leigh Scott
commit e724f0f6a759e3b1b87f6d286b79222690508739
Merge: caeff9e 4bf52ce
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Mar 26 09:42:34 2018 +0100
Merge branch 'master' into el7
99-nvidia-dracut.conf | 6 +++---
nvidia-fallback.service | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
---
6 years, 1 month
[xorg-x11-drv-nvidia/el7: 32/33] sync with master
by Leigh Scott
commit caeff9eb198b2a8c30aad0559287836d850db13d
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Mar 26 09:42:21 2018 +0100
sync with master
sources | 6 +-
xorg-x11-drv-nvidia.spec | 183 ++++++++++++++++++++++-------------------------
2 files changed, 88 insertions(+), 101 deletions(-)
---
diff --git a/sources b/sources
index 59cec25..b8dc621 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-0428addcf69a21a955e4caf4c90d0c68 NVIDIA-Linux-x86_64-384.111.run
-2d2d5e12b3d677b9e8864320150e2499 NVIDIA-Linux-x86-384.111.run
-24d08961421d98e0df138b95f6f3cdbf NVIDIA-Linux-armv7l-gnueabihf-384.111.run
+29576eef65239d8c18e29bfdd68d34dd NVIDIA-Linux-armv7l-gnueabihf-390.42.run
+453c6fb7f892eb53bf32011fc0da770d NVIDIA-Linux-x86-390.42.run
+41456a83e39bf0088c30247cd1536559 NVIDIA-Linux-x86_64-390.42.run
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index a0fb99b..4c3a287 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -16,7 +16,7 @@
%global _dracut_conf_d %{_sysconfdir}/dracut.conf.d
%global _grubby /sbin/grubby --grub --update-kernel=ALL
%else #rhel > 6 or fedora
-%global _dracut_conf_d %{_prefix}/lib/dracut.conf.d
+%global _dracut_conf_d %{_prefix}/lib/dracut/dracut.conf.d
%global _modprobe_d %{_prefix}/lib/modprobe.d/
%global _grubby %{_sbindir}/grubby --update-kernel=ALL
%if 0%{?rhel} == 7
@@ -35,16 +35,16 @@
Name: xorg-x11-drv-nvidia
-Epoch: 2
-Version: 384.111
-Release: 1%{?dist}
+Epoch: 3
+Version: 390.42
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
-Source0: http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-...
-Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x...
-Source2: http://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Linu...
+Source0: https://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86...
+Source1: https://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-...
+Source2: https://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Lin...
Source4: 99-nvidia.conf
Source5: 00-avoid-glamor.conf
@@ -85,6 +85,12 @@ Requires(post): ldconfig
Requires(postun): ldconfig
Requires(post): grubby
Requires: which
+Requires: nvidia-settings%{?_isa} = %{version}
+%if 0%{?fedora}
+Suggests: nvidia-xconfig%{?_isa} = %{version}
+%else
+Requires: nvidia-xconfig%{?_isa} = %{version}
+%endif
Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
Requires: %{name}-libs%{?_isa} = %{?epoch}:%{version}-%{release}
@@ -137,7 +143,12 @@ such as OpenGL headers.
Summary: CUDA driver for %{name}
Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
Requires: %{name}-cuda-libs%{?_isa} = %{?epoch}:%{version}-%{release}
-Provides: nvidia-persistenced = %{version}-%{release}
+Requires: nvidia-persistenced%{?_isa} = %{version}
+%if 0%{?fedora}
+Suggests: nvidia-modprobe%{?_isa} = %{version}
+%else
+Requires: nvidia-modprobe%{?_isa} = %{version}
+%endif
Requires: ocl-icd%{?_isa}
Requires: opencl-filesystem
@@ -230,13 +241,12 @@ cp -a \
libnvidia-fbc.so.%{version} \
libnvidia-glcore.so.%{version} \
libnvidia-glsi.so.%{version} \
- libnvidia-gtk*.so.%{version} \
libnvidia-ifr.so.%{version} \
libnvidia-ml.so.%{version} \
libnvidia-ptxjitcompiler.so.%{version} \
%{buildroot}%{_libdir}/
-%if 0%{?rhel} || 0%{?fedora} == 24
+%if 0%{?rhel} && 0%{?rhel} < 8
mkdir -p %{buildroot}%{_nvidia_libdir}
cp -a \
libEGL.so.%{version} \
@@ -271,10 +281,7 @@ install -D -p -m 0755 libvdpau_nvidia.so.%{version} %{buildroot}%{_libdir}/vdpau
ln -sf libvdpau_nvidia.so.%{version} %{buildroot}%{_libdir}/vdpau/libvdpau_nvidia.so.1
# GlVND
-%if 0%{?fedora} >= 25
-# We keep the same symlink than mesa-libGL to avoid conflict
-ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
-%else
+%if 0%{?rhel} && 0%{?rhel} < 8
ln -s libGLX_nvidia.so.%{version} %{buildroot}%{_libdir}/libGLX_indirect.so.0
# ld.so.conf.d file
install -m 0755 -d %{buildroot}%{_sysconfdir}/ld.so.conf.d/
@@ -320,7 +327,7 @@ install -p -m 0644 %{SOURCE16} %{buildroot}%{_dracut_conf_d}/
# Install binaries
install -m 0755 -d %{buildroot}%{_bindir}
-install -p -m 0755 nvidia-{bug-report.sh,debugdump,smi,cuda-mps-control,cuda-mps-server,xconfig,settings,persistenced} \
+install -p -m 0755 nvidia-{bug-report.sh,debugdump,smi,cuda-mps-control,cuda-mps-server} \
%{buildroot}%{_bindir}
# Install headers
@@ -329,20 +336,9 @@ install -p -m 0644 {gl.h,glext.h,glx.h,glxext.h} %{buildroot}%{_includedir}/nvid
# Install man pages
install -m 0755 -d %{buildroot}%{_mandir}/man1/
-install -p -m 0644 nvidia-{cuda-mps-control,persistenced,settings,smi,xconfig}.1.gz \
+install -p -m 0644 nvidia-{cuda-mps-control,smi}.1.gz \
%{buildroot}%{_mandir}/man1/
-# Install nvidia icon
-mkdir -p %{buildroot}%{_datadir}/pixmaps
-install -pm 0644 nvidia-settings.png %{buildroot}%{_datadir}/pixmaps
-
-# Fix desktop file and validate
-sed -i -e 's|__UTILS_PATH__/||g' -e 's|__PIXMAP_PATH__/||g' nvidia-settings.desktop
-sed -i -e 's|nvidia-settings.png|nvidia-settings|g' nvidia-settings.desktop
-desktop-file-install --vendor "" \
- --dir %{buildroot}%{_datadir}/applications/ \
- nvidia-settings.desktop
-
#Alternate-install-present is checked by the nvidia .run
mkdir -p %{buildroot}%{_alternate_dir}
install -p -m 0644 %{SOURCE7} %{buildroot}%{_alternate_dir}
@@ -354,7 +350,7 @@ install -p -m 0644 nvidia-application-profiles-%{version}-{rc,key-documentation}
#Install the Xorg configuration files
mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
mkdir -p %{buildroot}%{_datadir}/X11/xorg.conf.d
-%if 0%{?fedora} >= 25
+%if 0%{?fedora} >= 25 || 0%{?rhel} >= 8
install -pm 0644 %{SOURCE10} %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
touch -r %{SOURCE10} %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
@@ -373,16 +369,6 @@ touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/nvidia.conf
-#Install the initscript
-tar jxf nvidia-persistenced-init.tar.bz2
-%if 0%{?rhel} > 6 || 0%{?fedora}
-mkdir -p %{buildroot}%{_unitdir}
-install -pm 0644 nvidia-persistenced-init/systemd/nvidia-persistenced.service.template \
- %{buildroot}%{_unitdir}/nvidia-persistenced.service
-#Change the daemon running owner
-sed -i -e "s/__USER__/root/" %{buildroot}%{_unitdir}/nvidia-persistenced.service
-%endif
-
#Create the default nvidia config directory
mkdir -p %{buildroot}%{_sysconfdir}/nvidia
@@ -392,6 +378,7 @@ tar Jcf %{buildroot}%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-%{
#Add autostart file for nvidia-settings to load user config
install -D -p -m 0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
+desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
%if 0%{?fedora} >= 25
# install AppData and add modalias provides
@@ -405,7 +392,8 @@ fn=%{buildroot}%{_datadir}/appdata/xorg-x11-drv-nvidia.metainfo.xml
%endif
# Install nvidia-fallback
-%if 0%{?rhel} >= 6 || 0%{?fedora}
+%if 0%{?rhel} > 6 || 0%{?fedora}
+mkdir -p %{buildroot}%{_unitdir}
install -p -m 0644 %{SOURCE20} %{buildroot}%{_udevrulesdir}
install -p -m 0644 %{SOURCE21} %{buildroot}%{_unitdir}
%endif
@@ -419,16 +407,22 @@ if [ "$1" -eq "1" ]; then
fi
%post
-/sbin/ldconfig
if [ "$1" -eq "1" ]; then
%{_grubby} --remove-args='nomodeset' --args='%{_dracutopts}' &>/dev/null
%if 0%{?fedora} || 0%{?rhel} >= 7
sed -i -e 's/GRUB_CMDLINE_LINUX="/GRUB_CMDLINE_LINUX="%{_dracutopts} /g' /etc/default/grub
%endif
+# Until mutter enable egl stream support, we need to disable gdm wayland
+# https://bugzilla.redhat.com/1462052
+%if 0%{?fedora}
+ if [ -f %{_sysconfdir}/gdm/custom.conf ] ; then
+ sed -i -e 's/#WaylandEnable=.*/WaylandEnable=false/' %{_sysconfdir}/gdm/custom.conf
+ fi
+%endif
fi || :
%if 0%{?fedora} || 0%{?rhel} >= 7
-%triggerun -- xorg-x11-drv-nvidia < 2:384.59-5
+%triggerun -- xorg-x11-drv-nvidia < 3:384.59-5
if [ -f %{_sysconfdir}/default/grub ] ; then
sed -i -e '/GRUB_GFXPAYLOAD_LINUX=text/d' %{_sysconfdir}/default/grub
. %{_sysconfdir}/default/grub
@@ -447,19 +441,8 @@ fi
%{_grubby} --args='%{_dracutopts}' &>/dev/null || :
%endif
-%post libs -p /sbin/ldconfig
-
-%post cuda
-%if 0%{?rhel} > 6 || 0%{?fedora}
-%systemd_post nvidia-persistenced.service
-%endif
-
-%post cuda-libs -p /sbin/ldconfig
-
-%if 0%{?rhel} == 6
-%posttrans
-[ -f %{_sysconfdir}/X11/xorg.conf ] || cp -p %{_sysconfdir}/X11/xorg.conf.nvidia %{_sysconfdir}/X11/xorg.conf || :
-%endif
+%ldconfig_scriptlets libs
+%ldconfig_scriptlets cuda-libs
%preun
if [ "$1" -eq "0" ]; then
@@ -471,21 +454,6 @@ if [ "$1" -eq "0" ]; then
[ -f %{_sysconfdir}/X11/xorg.conf ] && mv %{_sysconfdir}/X11/xorg.conf %{_sysconfdir}/X11/xorg.conf.nvidia_uninstalled &>/dev/null
fi ||:
-%if 0%{?rhel} > 6 || 0%{?fedora}
-%preun cuda
-%systemd_preun nvidia-persistenced.service
-%endif
-
-%postun -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-%postun cuda
-%if 0%{?rhel} > 6 || 0%{?fedora}
-%systemd_postun_with_restart nvidia-persistenced.service
-%endif
-
-%postun cuda-libs -p /sbin/ldconfig
%files
%license nvidiapkg/LICENSE
@@ -526,39 +494,21 @@ fi ||:
%endif
%config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
%{_bindir}/nvidia-bug-report.sh
-%{_bindir}/nvidia-settings
-%{_bindir}/nvidia-xconfig
# Xorg libs that do not need to be multilib
%dir %{_nvidia_xorgdir}
%{_nvidia_xorgdir}/libglx.so
%{_nvidia_xorgdir}/libglx.so.%{version}
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
-%ifarch %{arm}
-%{_libdir}/libnvidia-gtk2.so.%{version}
-%endif
-%ifarch x86_64 i686
-%if 0%{?rhel} == 6
-%exclude %{_libdir}/libnvidia-gtk3.so.%{version}
-%{_libdir}/libnvidia-gtk2.so.%{version}
-%else
-%exclude %{_libdir}/libnvidia-gtk2.so.%{version}
-%{_libdir}/libnvidia-gtk3.so.%{version}
-%endif
-%endif
#/no_multilib
%dir %{_datadir}/nvidia
%{_datadir}/nvidia/nvidia-application-profiles-%{version}-*
-%{_datadir}/applications/*nvidia-settings.desktop
-%{_datadir}/pixmaps/*.png
-%{_mandir}/man1/nvidia-settings.*
-%{_mandir}/man1/nvidia-xconfig.*
%files kmodsrc
%dir %{_datadir}/nvidia-kmod-%{version}
%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-%{_target_cpu}.tar.xz
%files libs
-%if 0%{?rhel} || 0%{?fedora} == 24
+%if 0%{?rhel} && 0%{?rhel} < 8
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%{_nvidia_libdir}/libEGL.so.1
%{_nvidia_libdir}/libEGL.so.%{version}
@@ -576,7 +526,9 @@ fi ||:
%{_libdir}/libGLESv1_CM_nvidia.so.%{version}
%{_libdir}/libGLESv2_nvidia.so.2
%{_libdir}/libGLESv2_nvidia.so.%{version}
+%if 0%{?rhel}
%{_libdir}/libGLX_indirect.so.0
+%endif
%{_libdir}/libGLX_nvidia.so.0
%{_libdir}/libGLX_nvidia.so.%{version}
%{_libdir}/libnvidia-cfg.so.1
@@ -594,20 +546,15 @@ fi ||:
%files cuda
%license nvidiapkg/LICENSE
-%if 0%{?rhel} > 6 || 0%{?fedora}
-%{_unitdir}/nvidia-persistenced.service
-%endif
%{_bindir}/nvidia-debugdump
%{_bindir}/nvidia-smi
%{_bindir}/nvidia-cuda-mps-control
%{_bindir}/nvidia-cuda-mps-server
-%{_bindir}/nvidia-persistenced
%ifarch x86_64 i686
%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd
%endif
%{_mandir}/man1/nvidia-smi.*
%{_mandir}/man1/nvidia-cuda-mps-control.1.*
-%{_mandir}/man1/nvidia-persistenced.1.*
%{_modprobe_d}/nvidia-uvm.conf
%{_udevrulesdir}/60-nvidia-uvm.rules
@@ -636,13 +583,53 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
-* Sat Jan 13 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2:384.111-1
-- Update to 384.111 release
+* Mon Mar 19 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3:390.42-2
+- Disable since we rely on OutputClass here
+- Use PrimaryGPU feature since Xorg >= 1.19
+- Use ldconfig_scriptlets macro
+- Disable uneeded ldconfig call from main
+- Disable wayland if gdm is available - See rhbz#1462052
+- Fixup removed f24 support
+- Fixup urls
+
+* Tue Mar 13 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:390.42-1
+- Update to 390.42 release
+
+* Fri Mar 02 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 3:390.25-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Feb 16 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:390.25-4
+- mesa-libGL provides libGLX_indirect.so.0 on fedora
+
+* Thu Feb 15 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:390.25-3
+- Bump epoch to prevent cuda repo from replacing -kmodsrc
+
+* Fri Feb 02 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2:390.25-2
+- Fix omitting drivers from the initrd.
-* Tue Nov 07 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:384.98-1
-- Update to 384.98 release
+* Mon Jan 29 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2:390.25-1
+- Update to 390.25 release
+
+* Wed Jan 10 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2:390.12-1
+- Update to 390.12 beta
+
+* Sat Dec 16 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:387.34-2
+- Add plymouth advertising for nvidia-fallback.service
+
+* Sun Nov 26 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:387.34-1
+- Update to 387.34 release
+
+* Sun Nov 05 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:387.22-3
- Remove nomodeset from cmdline during install
-- Add nvidia-driver virtual provides
+
+* Tue Oct 31 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:387.22-2
+- Remove the prebuilt tools and use rpm packages instead
+
+* Mon Oct 30 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:387.22-1
+- Update to 387.22 release
+
+* Wed Oct 04 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:387.12-1
+- Update to 387.12 beta
* Thu Sep 21 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:384.90-1
- Update to 384.90 release
6 years, 1 month
[xorg-x11-drv-nvidia/el7] (33 commits) ...Merge branch 'master' into el7
by Leigh Scott
Summary of changes:
d2f6479... Add nvidia-driver virtual provides (*)
7cc4aa0... Update to 387.12 beta (*)
e2904f9... Update to 387.22 release (*)
0b5ace5... make changes to use external tools (*)
d624ee2... bump changelog and cleanup previous commit (*)
2774ad4... Remove nomodeset from cmdline during %post (*)
8501f78... Remove nomodeset from cmdline during install (*)
fefaf7e... Fix non-glvnd build (*)
93ea25d... Update to 387.34 release (*)
d3b56f5... Add fallback message (*)
8bdc6e9... Improve message (*)
8ff93dd... Add nvidia-fallback message (*)
005eecd... Update to 390.12 beta (*)
463afbb... Update to 390.25 release (*)
82057e6... Fix omitting drivers from the initrd. (*)
de92ef6... Bump epoch to prevent cuda repo from replacing -kmodsrc (*)
f64d85b... fix changelog (*)
dde81f7... mesa-libGL provides libGLX_indirect.so.0 on fedora (*)
f0500c7... - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass (*)
625f74f... Update to 390.42 release (*)
4095318... Fixup urls (*)
5e36ca5... Fixup removed f24 support (*)
679fb78... Disable wayland if gdm is available (*)
8f9e11d... Disable uneeded ldconfig call from main (*)
8163968... Use ldconfig_scriptlets macro (*)
fc66ddc... Use PrimaryGPU feature since Xorg >= 1.19 (*)
94ec42e... Disable since we rely on OutputClass here (*)
9e60f63... Fixup gdm support (*)
c492144... Update changelog (*)
0293d8c... Add conditionals, RHEL has no Suggests (*)
4bf52ce... Fix el7 build (*)
caeff9e... sync with master
e724f0f... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent
6 years, 1 month
[xorg-x11-drv-nvidia] Fix el7 build
by Leigh Scott
commit 4bf52ce4761ca376776f61eac41523338434ab66
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Mar 26 09:16:13 2018 +0100
Fix el7 build
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 6e8bbb1..4c3a287 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -350,7 +350,7 @@ install -p -m 0644 nvidia-application-profiles-%{version}-{rc,key-documentation}
#Install the Xorg configuration files
mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
mkdir -p %{buildroot}%{_datadir}/X11/xorg.conf.d
-%if 0%{?fedora} >= 25 || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 25 || 0%{?rhel} >= 8
install -pm 0644 %{SOURCE10} %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
touch -r %{SOURCE10} %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
6 years, 1 month