packages: xscreensaver/xscreensaver.spec - 5.13 - removed duplicate desktop...

[baggins]

Author: baggins                      Date: Fri May  6 11:00:23 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 5.13
- removed duplicate desktop file
- added xdg autostart
- cleaned up files

---- Files affected:
packages/xscreensaver:
   xscreensaver.spec (1.167 -> 1.168) 

---- Diffs:

================================================================
Index: packages/xscreensaver/xscreensaver.spec
diff -u packages/xscreensaver/xscreensaver.spec:1.167 packages/xscreensaver/xscreensaver.spec:1.168
--- packages/xscreensaver/xscreensaver.spec:1.167	Sat Mar  5 15:48:21 2011
+++ packages/xscreensaver/xscreensaver.spec	Fri May  6 13:00:17 2011
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-# TODO:
-# make package for KDE with /usr/bin/xscreensaver.kss
-#
 Summary:	X screen savers
 Summary(de.UTF-8):	X-Bildschirmschoner
 Summary(es.UTF-8):	Protectores de pantalla X
@@ -12,21 +9,21 @@
 Summary(uk.UTF-8):	Набір програм збереження екрану для X Window
 Summary(zh_CN.UTF-8):	X 窗口系统保护器
 Name:		xscreensaver
-Version:	5.10
-Release:	4
+Version:	5.13
+Release:	1
 Epoch:		1
 License:	BSD
 Group:		X11/Applications
 Source0:	http://www.jwz.org/xscreensaver/%{name}-%{version}.tar.gz
-# Source0-md5:	0d7205f9da8e3f1b83bcda549d73a7c4
-Source1:	%{name}.desktop
+# Source0-md5:	a1a55b763e17c5c83a2b7cb5ddf23560
+Source1:	%{name}-autostart.desktop
 Source2:	%{name}-lock.desktop
 Source3:	%{name}.pamd
 Source4:	mkinstalldirs
-Patch1:		%{name}-desktop.patch
-Patch2:		%{name}-man.patch
-Patch3:		%{name}-degnomify.patch
-Patch4:		%{name}-build.patch
+Patch0:		%{name}-degnomify.patch
+Patch1:		%{name}-build.patch
+Patch2:		%{name}-test-passwd-segv-tty.patch
+Patch3:		%{name}-desktop.patch
 URL:		http://www.jwz.org/xscreensaver/
 BuildRequires:	OpenGL-devel
 BuildRequires:	OpenGL-glut-devel
@@ -157,10 +154,10 @@
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
 %patch3 -p1
-%patch4 -p1
 install -m755 %{SOURCE4} .
 
 %build
@@ -207,10 +204,10 @@
 	AD_DIR=%{_appdefsdir} \
 	PAM_DIR=/etc/pam.d
 
-install -d $RPM_BUILD_ROOT{/etc/pam.d,%{_desktopdir}}
+install -d $RPM_BUILD_ROOT{/etc/{pam.d,xdg/autostart},%{_desktopdir}}
 
-install %{SOURCE1} %{SOURCE2} \
-	$RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/xdg/autostart
+install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
 
 %{__make} -C driver install-pam \
 	PAM_DIR=$RPM_BUILD_ROOT/etc/pam.d
@@ -277,11 +274,10 @@
 %attr(755,root,root) %{_bindir}/xscreensaver-demo
 %attr(755,root,root) %{_bindir}/xscreensaver-getimage*
 %attr(755,root,root) %{_bindir}/xscreensaver-text
-#%attr(755,root,root) %{_bindir}/xscreensaver.kss
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/xscreensaver
+/etc/xdg/autostart/xscreensaver-autostart.desktop
 %{_appdefsdir}/*
 %{_datadir}/%{name}/glade
-%{_desktopdir}/xscreensaver.desktop
 %{_desktopdir}/xscreensaver-properties.desktop
 %{_desktopdir}/xscreensaver-lock.desktop
 %{_mandir}/man1/xscreensaver.1*
@@ -291,20 +287,6 @@
 %{_mandir}/man1/xscreensaver-text.1*
 %{_pixmapsdir}/*.xpm
 
-#%{_datadir}/%{name}/cosmos.xml
-#%{_datadir}/%{name}/electricsheep.xml
-#%{_datadir}/%{name}/fireflies.xml
-#%{_datadir}/%{name}/goban.xml
-#%{_datadir}/%{name}/sphereeversion.xml
-#%{_datadir}/%{name}/ssystem.xml
-#%{_datadir}/%{name}/xaos.xml
-#%{_datadir}/%{name}/xdaliclock.xml
-#%{_datadir}/%{name}/xearth.xml
-#%{_datadir}/%{name}/xfishtank.xml
-#%{_datadir}/%{name}/xmountains.xml
-#%{_datadir}/%{name}/xplanet.xml
-#%{_datadir}/%{name}/xsnow.xml
-
 %files common
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/xscreensaver-gl-helper
@@ -327,6 +309,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.168  2011/05/06 11:00:17  baggins
+- 5.13
+- removed duplicate desktop file
+- added xdg autostart
+- cleaned up files
+
 Revision 1.167  2011/03/05 14:48:21  arekm
 - rel 4; drop BR esound-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xscreensaver/xscreensaver.spec?r1=1.167&r2=1.168&f=u