commit b6211b73a92c334c09ff6a072811a33fcf6bdce5 Author: Richard Shaw <hobbes1069(a)gmail.com&gt; Date: Mon Oct 8 10:58:10 2018 -0500 Add requirement for the nvidia-xsettings-390xx package. xorg-x11-drv-nvidia-390xx.spec | 56 +++++------------------------------------- 1 file changed, 6 insertions(+), 50 deletions(-) --- diff --git a/xorg-x11-drv-nvidia-390xx.spec b/xorg-x11-drv-nvidia-390xx.spec index cc94ad4..873924b 100644 --- a/xorg-x11-drv-nvidia-390xx.spec +++ b/xorg-x11-drv-nvidia-390xx.spec @@ -59,13 +59,8 @@ Source15: nvidia-uvm.conf Source16: 99-nvidia-dracut.conf Source20: 10-nvidia.rules Source21: nvidia-fallback.service -Source22: nvidia-settings-user.desktop -Source23: nvidia-settings.appdata.xml -ExclusiveArch: i686 x86_64 armv7hl - -BuildRequires: desktop-file-utils -BuildRequires: libappstream-glib +ExclusiveArch: i686 x86_64 armv7hl %if 0%{?rhel} > 6 || 0%{?fedora} Buildrequires: systemd @@ -88,7 +83,7 @@ Requires(post): ldconfig Requires(postun): ldconfig Requires(post): grubby Requires: which -Requires: nvidia-settings-390xx%{?_isa} = %{?epoch}:%{version} +Requires: nvidia-settings-390xx%{?_isa} = %{version} #if 0%{?fedora} #Suggests: nvidia-xconfig%{?_isa} = %{version} #else @@ -209,16 +204,6 @@ Requires: vulkan-filesystem This package provides the shared libraries for %{name}. -%package -n nvidia-settings-390xx -Summary: Configure the NVIDIA 390xx series graphics driver -Conflicts: nvidia-settings - -%description -n nvidia-settings-390xx -The nvidia-settings utility is a tool for configuring the NVIDIA graphics -driver. It operates by communicating with the NVIDIA X driver, querying -and updating state as appropriate. - - %prep %setup -q -c -T #Only extract the needed arch @@ -406,8 +391,6 @@ fn=%{buildroot}%{_metainfodir}/xorg-x11-drv-nvidia-390xx.metainfo.xml %{SOURCE13} README.txt "NVIDIA QUADRO GPUS" | xargs appstream-util add-provide ${fn} modalias %{SOURCE13} README.txt "NVIDIA NVS GPUS" | xargs appstream-util add-provide ${fn} modalias %{SOURCE13} README.txt "NVIDIA TESLA GPUS" | xargs appstream-util add-provide ${fn} modalias -mkdir -p %{buildroot}%{_datadir}/pixmaps -install -pm 0644 nvidia-settings.png %{buildroot}%{_datadir}/pixmaps/%{name}.png %endif # Install nvidia-fallback @@ -417,24 +400,8 @@ install -p -m 0644 %{SOURCE20} %{buildroot}%{_udevrulesdir} install -p -m 0644 %{SOURCE21} %{buildroot}%{_unitdir} %endif -# Install nvidia-settings and dependencies -mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart \ - %{buildroot}%{_bindir} \ - %{buildroot}%{_datadir}/{applications,pixmaps} \ - %{buildroot}%{_mandir}/man1 \ - %{buildroot}%{_metainfodir} - -install -pm 0644 %{SOURCE22} %{buildroot}%{_sysconfdir}/xdg/autostart/ -install -pm 0755 nvidia-settings %{buildroot}%{_bindir}/ -install -pm 0755 libnvidia-gtk3.so.%{version} %{buildroot}%{_libdir}/ -install -pm 0644 %{SOURCE23} %{buildroot}%{_metainfodir}/ -install -pm 0644 nvidia-settings.desktop %{buildroot}%{_datadir}/applications/ -install -pm 0644 nvidia-settings.1.gz %{buildroot}%{_mandir}/man1/ -install -pm 0644 nvidia-settings.png %{buildroot}%{_datadir}/pixmaps/ - -%check -desktop-file-validate %{buildroot}/%{_datadir}/applications/nvidia-settings.desktop -appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml +mkdir -p %{buildroot}%{_datadir}/pixmaps +install -pm 0644 nvidia-settings.png %{buildroot}%{_datadir}/pixmaps/%{name}.png %pre @@ -615,25 +582,14 @@ fi ||: %{_libdir}/libnvidia-opencl.so.%{version} %endif -%files -n nvidia-settings-390xx -%{_sysconfdir}/xdg/autostart/nvidia-settings-user.desktop -%{_bindir}/nvidia-settings -%{_datadir}/applications/nvidia-settings.desktop -%{_datadir}/pixmaps/nvidia-settings.png -%{_libdir}/libnvidia-gtk3.so.%{version} -%{_mandir}/man1/nvidia-settings.1* -%{_metainfodir}/nvidia-settings.appdata.xml - - - %files devel %{_includedir}/nvidia/ %{_libdir}/libnvcuvid.so %{_libdir}/libnvidia-encode.so %changelog -* Sat Oct 06 2018 Richard Shaw <hobbes1069(a)gmail.com&gt; - 3:390.87-2 -- Add nvidia-xsettings-390xx subpackage. +* Sat Oct 08 2018 Richard Shaw <hobbes1069(a)gmail.com&gt; - 3:390.87-2 +- Add requirement for the nvidia-xsettings-390xx package. * Sun Sep 23 2018 Richard Shaw <hobbes1069(a)gmail.com&gt; - 3:390.87-1 - Update to 390.87.