SPECS: xscreensaver.spec - updated to 5.06 - gnome-screensaver-properties.d...

[adamg]

Author: adamg                        Date: Mon Jul 21 13:58:19 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 5.06
- gnome-screensaver-properties.desktop merged into xscreensaver-properties
- Obsoletes: xscreensaver-gnome2

---- Files affected:
SPECS:
   xscreensaver.spec (1.158 -> 1.159) 

---- Diffs:

================================================================
Index: SPECS/xscreensaver.spec
diff -u SPECS/xscreensaver.spec:1.158 SPECS/xscreensaver.spec:1.159
--- SPECS/xscreensaver.spec:1.158	Sun Mar  9 17:34:04 2008
+++ SPECS/xscreensaver.spec	Mon Jul 21 15:58:14 2008
@@ -12,13 +12,13 @@
 Summary(uk.UTF-8):	Набір програм збереження екрану для X Window
 Summary(zh_CN.UTF-8):	X 窗口系统保护器
 Name:		xscreensaver
-Version:	5.05
+Version:	5.06
 Release:	1
 Epoch:		1
 License:	BSD
 Group:		X11/Applications
 Source0:	http://www.jwz.org/xscreensaver/%{name}-%{version}.tar.gz
-# Source0-md5:	d759262b10d76f87f1a7fc50ae8664d4
+# Source0-md5:	c6b2cab02aaea32684d37a9a76488e0f
 Source1:	%{name}.desktop
 Source2:	%{name}-lock.desktop
 Source3:	%{name}.pamd
@@ -49,6 +49,7 @@
 Requires:	xorg-lib-libXt >= 1.0.0
 Obsoletes:	xscreensaver-gnome
 Obsoletes:	xscreensaver-gnome1
+Obsoletes:	xscreensaver-gnome2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautoreqdep	libGL.so.1 libGLU.so.1 libGLcore.so.1
@@ -150,19 +151,6 @@
 %description GLE -l pl.UTF-8
 Wygaszacze ekranu pod X Window używające OpenGL oraz GLE.
 
-%package gnome2
-Summary:	GNOME2 support
-Summary(pl.UTF-8):	Wsparcie dla GNOME2
-Group:		X11/Applications
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	control-center >= 1:2.0
-
-%description gnome2
-GNOME2 support.
-
-%description gnome2 -l pl.UTF-8
-Wsparcie dla GNOME2.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -289,6 +277,7 @@
 %{_appdefsdir}/*
 %{_datadir}/%{name}/glade
 %{_desktopdir}/xscreensaver.desktop
+%{_desktopdir}/xscreensaver-properties.desktop
 %{_desktopdir}/xscreensaver-lock.desktop
 %{_mandir}/man1/xscreensaver.1*
 %{_mandir}/man1/xscreensaver-command.1*
@@ -327,21 +316,22 @@
 %files GLE -f files.gle
 %defattr(644,root,root,755)
 
-%files gnome2
-%defattr(644,root,root,755)
-%{_desktopdir}/gnome-screensaver-properties.desktop
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.158  2008/03/09 16:34:04  arekm
+Revision 1.159  2008/07/21 13:58:14  adamg
+- updated to 5.06
+- gnome-screensaver-properties.desktop merged into xscreensaver-properties
+- Obsoletes: xscreensaver-gnome2
+
+Revision 1.158  2008-03-09 16:34:04  arekm
 - up to 5.05
 
 Revision 1.157  2007/08/04 15:32:28  patrys
-- don't obsolere gnome-screensaver
+- don't obsolete gnome-screensaver
 
 Revision 1.156  2007/05/18 05:26:34  qboosh
 - recent CVE reference
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xscreensaver.spec?r1=1.158&r2=1.159&f=u