12:04 p.m.
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8973/devel
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/devel/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 5 Apr 2013 08:13:57 -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: 1%{?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,14 +27,19 @@
%else
ExclusiveArch: i386 x86_64
%endif
-Requires: nvidia-xconfig
-Requires: nvidia-settings
+#Obsoletes: nvidia-xconfig < 1.0-30
+#Provides: nvidia-xconfig = %{version}-%{release}
+#Obsoletes: nvidia-settings < 1.0-34
+#Provides: nvidia-settings = %{version}-%{release}
+#Obsoletes: nvidia-settings-desktop < 1.0-34
+#Provides: nvidia-settings-desktop = %{version}-%{release}
Requires: nvidia-173xx-kmod >= %{version}
Requires(post): nvidia-173xx-kmod >= %{version}
# 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
@@ -63,12 +69,12 @@
%{?filter_setup:
%filter_from_provides /^libnvidia/d;
-%filter_from_provides /^libGLCore\.so/d;
+%filter_from_provides /^libGLcore\.so/d;
%filter_from_provides /^libGL\.so/d;
%filter_from_provides /^libXvMCNVIDIA_dynamic\.so\.1/d;
%filter_from_provides /^libglx\.so/d;
%filter_from_requires /^libnvidia/d;
-%filter_from_requires /^libGLCore\.so/d;
+%filter_from_requires /^libGLcore\.so/d;
%filter_from_requires /^libGL\.so/d;
%filter_from_requires /^libXvMCNVIDIA_dynamic\.so\.1/d;
%filter_from_requires /^libglx\.so/d;
@@ -235,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
@@ -293,10 +305,11 @@
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
%config(noreplace) %{_sysconfdir}/X11/nvidia-173xx-xorg.conf
#{_initrddir}/nvidia-173xx
-%exclude %{_bindir}/nvidia-settings
-%exclude %{_sbindir}/nvidia-xconfig
+%{_bindir}/nvidia-settings
+%{_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
@@ -304,8 +317,8 @@
%{_libdir}/xorg/modules/extensions/nvidia/*.so*
#/no_multilib
%{_datadir}/pixmaps/*.png
-%exclude %{_mandir}/man1/nvidia-settings.*
-%exclude %{_mandir}/man1/nvidia-xconfig.*
+%{_mandir}/man1/nvidia-settings.*
+%{_mandir}/man1/nvidia-xconfig.*
%files libs
%defattr(-,root,root,-)
@@ -327,6 +340,17 @@
%changelog
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-5
+- Avoid Obsoletes until rhbz#985944
+- Restore destop file
+
+* Mon Jul 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-4
+- Avoid a Virtual Provides for legacy series
+- Fix typo with libGLcore filter
+
+* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-2
+- Restore nvidia-settings and nvidia-xconfig - rfbz#2852
+
* Fri Apr 05 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-1
- Update to 173.14.37