rpms/xorg-x11-drv-nvidia-173xx/F-18 nvidia-settings.desktop, 1.4, 1.5 xorg-x11-drv-nvidia-173xx.spec, 1.25, 1.26

Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8973/F-18 Modified Files: xorg-x11-drv-nvidia-173xx.spec Added Files: nvidia-settings.desktop Log Message: - Avoid Obsoletes until rhbz#985944 - Restore destop file Index: nvidia-settings.desktop =================================================================== RCS file: nvidia-settings.desktop diff -N nvidia-settings.desktop --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ nvidia-settings.desktop 21 Jul 2013 12:04:09 -0000 1.5 @@ -0,0 +1,30 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=NVIDIA X Server Settings +Comment=Configure NVIDIA X Server Settings +Exec=nvidia-settings +Icon=nvidia-settings +Categories=System;Settings; + +# Translations provided by Sun Microsystems +Name[de]=NVIDIA X-Server-Einstellungen +Name[es]=Valores de configuración del servidor NVIDIA X +Name[fr]=Paramètres du serveur X NVIDIA +Name[it]=NVIDIA X Server Settings +Name[ja]=NVIDIA X サーバー設定 +Name[ko]=NVIDIA X 서버 설정 +Name[pt_BR]=Configurações do NVIDIA X Server +Name[zh_CN]=NVIDIA X 服务器设置 +Name[zh_HK]=NVIDIA X 伺服器設定 +Name[zh_TW]=NVIDIA X 伺服器設定 +Comment[de]=Konfigurieren der NVIDIA X-Server-Einstellungen +Comment[es]=Establezca los valores de configuración del servidor NVIDIA X +Comment[fr]=Configurer les paramètres du serveur X NVIDIA +Comment[it]=Configura NVIDIA X Server Settings +Comment[ja]=NVIDIA X サーバー設定を構成します +Comment[ko]=NVIDIA X 서버 설정 구성 +Comment[pt_BR]=Definir &configurações de gerenciamento de usuário... +Comment[zh_CN]=配置 NVIDIA X 服务器设置 +Comment[zh_HK]=配置 NVIDIA X 伺服器設定 +Comment[zh_TW]=配置 NVIDIA X 伺服器設定 Index: xorg-x11-drv-nvidia-173xx.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-18/xorg-x11-drv-nvidia-173xx.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- xorg-x11-drv-nvidia-173xx.spec 18 Jul 2013 07:53:59 -0000 1.25 +++ xorg-x11-drv-nvidia-173xx.spec 21 Jul 2013 12:04:09 -0000 1.26 @@ -5,7 +5,7 @@ Name: xorg-x11-drv-nvidia-173xx Version: 173.14.37 -Release: 4%{?dist} +Release: 5%{?dist} Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -17,6 +17,7 @@ Source3: nvidia-173xx-xorg.conf Source6: blacklist-nouveau.conf Source11: nvidia-173xx-README.Fedora +Source99: nvidia-settings.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if 0%{?fedora} > 11 || 0%{?rhel} > 5 @@ -26,11 +27,11 @@ %else ExclusiveArch: i386 x86_64 %endif -Obsoletes: nvidia-xconfig < 1.0-30 +#Obsoletes: nvidia-xconfig < 1.0-30 #Provides: nvidia-xconfig = %{version}-%{release} -Obsoletes: nvidia-settings < 1.0-34 +#Obsoletes: nvidia-settings < 1.0-34 #Provides: nvidia-settings = %{version}-%{release} -Obsoletes: nvidia-settings-desktop < 1.0-34 +#Obsoletes: nvidia-settings-desktop < 1.0-34 #Provides: nvidia-settings-desktop = %{version}-%{release} Requires: nvidia-173xx-kmod >= %{version} @@ -38,6 +39,7 @@ # Needed in all nvidia or fglrx driver packages BuildRequires: prelink +BuildRequires: desktop-file-utils Requires: which #Requires: livna-config-display >= 0.0.22 %if 0%{?fedora} > 10 || 0%{?rhel} > 5 @@ -239,6 +241,12 @@ touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/ +#Restore desktop file +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +desktop-file-install --vendor "" \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --mode 644 \ + %{SOURCE99} %clean @@ -301,6 +309,7 @@ %{_sbindir}/nvidia-xconfig %{_bindir}/nvidia-bug-report.sh %{_bindir}/nvidia-smi +%{_datadir}/applications/*.desktop #{_sbindir}/nvidia-173xx-config-display # Xorg libs that do not need to be multilib %dir %{_libdir}/xorg/modules/extensions/nvidia @@ -331,6 +340,10 @@ %changelog +* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.37-5 +- Avoid Obsoletes until rhbz#985944 +- Restore destop file + * Mon Jul 15 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.37-4 - Avoid a Virtual Provides for legacy series - Fix typo with libGLcore filter