packages: nvidia-settings/nvidia-settings.spec, nvidia-settings/nvidia-sett...

[glen]

Author: glen                         Date: Sun Mar 13 19:15:12 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add .desktop file from xorg-driver-video-nvidia package

---- Files affected:
packages/nvidia-settings:
   nvidia-settings.spec (1.19 -> 1.20) , nvidia-settings.desktop (NONE -> 1.1)  (NEW), nvidia-settings.png (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nvidia-settings/nvidia-settings.spec
diff -u packages/nvidia-settings/nvidia-settings.spec:1.19 packages/nvidia-settings/nvidia-settings.spec:1.20
--- packages/nvidia-settings/nvidia-settings.spec:1.19	Mon Jun 14 15:04:25 2010
+++ packages/nvidia-settings/nvidia-settings.spec	Sun Mar 13 20:15:07 2011
@@ -8,12 +8,14 @@
 Summary(pl.UTF-8):	Narzędzie do konfigurowania sterownika NVIDIA
 Name:		nvidia-settings
 Version:	195.36.31
-Release:	1
+Release:	2
 License:	GPL
 Group:		X11
 Source0:	ftp://download.nvidia.com/XFree86/nvidia-settings/%{name}-%{version}.tar.gz
 # Source0-md5:	30782edbe54e99f678cb73e08cd67470
 Patch0:		%{name}-xlibs.patch
+Source1:	%{name}.desktop
+Source2:	%{name}.png
 URL:		ftp://download.nvidia.com/XFree86/nvidia-settings/
 BuildRequires:	OpenGL-devel
 BuildRequires:	xorg-lib-libX11-devel
@@ -99,9 +101,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %if %{with nvidia_settings}
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
-install nvidia-settings $RPM_BUILD_ROOT%{_bindir}
-install doc/nvidia-settings.1 $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings.1
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_desktopdir},%{_pixmapsdir}}
+install -p nvidia-settings $RPM_BUILD_ROOT%{_bindir}
+cp -p doc/nvidia-settings.1 $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings.1
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 %endif
 
 %if %{with libXNVCtrl}
@@ -119,8 +123,10 @@
 %if %{with nvidia_settings}
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/%{name}
-%{_mandir}/man1/*
+%attr(755,root,root) %{_bindir}/nvidia-settings
+%{_mandir}/man1/nvidia-settings.1*
+%{_desktopdir}/nvidia-settings.desktop
+%{_pixmapsdir}/nvidia-settings.png
 %endif
 
 %if %{with libXNVCtrl}
@@ -140,6 +146,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2011/03/13 19:15:07  glen
+- add .desktop file from xorg-driver-video-nvidia package
+
 Revision 1.19  2010/06/14 13:04:25  sparky
 - use rpmcppflags
 

================================================================
Index: packages/nvidia-settings/nvidia-settings.desktop
diff -u /dev/null packages/nvidia-settings/nvidia-settings.desktop:1.1
--- /dev/null	Sun Mar 13 20:15:13 2011
+++ packages/nvidia-settings/nvidia-settings.desktop	Sun Mar 13 20:15:07 2011
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=nVidia X Server Settings
+Name[pl]=Ustawienia X serwera nVidii
+Comment=Configure nVidia X Server Settings
+Comment[pl]=Konfiguracja ustawień X serwera NVndii
+Exec=nvidia-settings
+Icon=nvidia-settings
+Categories=Settings;HardwareSettings;

================================================================
Index: packages/nvidia-settings/nvidia-settings.png
<<Binary file>>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nvidia-settings/nvidia-settings.spec?r1=1.19&r2=1.20&f=u