SPECS (AC-branch): gnome-screensaver.spec - xscreensaver support (...

[havner]

Author: havner                       Date: Tue Aug  8 19:03:18 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- xscreensaver support (pregenerated desktop files based on
  xscreensaver 4.24)
- TODO
- changelog fixed

---- Files affected:
SPECS:
   gnome-screensaver.spec (1.23.2.5 -> 1.23.2.6) 

---- Diffs:

================================================================
Index: SPECS/gnome-screensaver.spec
diff -u SPECS/gnome-screensaver.spec:1.23.2.5 SPECS/gnome-screensaver.spec:1.23.2.6
--- SPECS/gnome-screensaver.spec:1.23.2.5	Tue Aug  8 19:11:52 2006
+++ SPECS/gnome-screensaver.spec	Tue Aug  8 21:03:13 2006
@@ -1,4 +1,9 @@
 # $Revision$, $Date$
+#
+# TODO:
+#	support for user switching
+#	floaters isn't working
+#
 Summary:	GNOME screensaver
 Summary(pl):	Wygaszacz ekranu GNOME
 Name:		gnome-screensaver
@@ -9,6 +14,8 @@
 Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.14/%{name}-%{version}.tar.bz2
 # Source0-md5:	f76677180432a89ac46a8507fe34b45a
 Source1:	%{name}.pamd
+Source2:	http://ep09.pld-linux.org/~havner/%{name}-xscreensaver.tar.gz
+# Source2-md5:	58ad753724418430fa93f02558056eab
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-cosmos_theme_dir.patch
 BuildRequires:	GConf2-devel >= 2.14.0
@@ -40,8 +47,21 @@
 Nowe rozwiązanie wygaszcza ekranu dla GNOME, z bardziej zgodnymi z HIG
 dialogami i lepszą integracją z desktopem niż stary xscreensaver.
 
+%package xscreensaver
+Summary:	Support for xscreensaver
+Summary(pl):	Wsparcie dla xscreensaver
+Group:		X11/Applications
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	xscreensaver-savers
+
+%description xscreensaver
+Support for xscreensaver.
+
+%description xscreensaver -l pl
+Wsparcie dla xscreensaver.
+
 %prep
-%setup -q
+%setup -q -a2
 %patch0 -p1
 %patch1 -p1
 
@@ -77,6 +97,17 @@
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
+_DIR=$(pwd)
+cd %{name}-xscreensaver
+# this one is provided by gnome-screensaver
+rm popsquares.desktop
+install * $RPM_BUILD_ROOT%{_datadir}/%{name}/themes
+echo '%defattr(644,root,root,755)' > $_DIR/xscreensaver.files
+for I in *; do
+	echo "%{_datadir}/%{name}/themes/$I" >> $_DIR/xscreensaver.files
+done
+cd $_DIR
+
 %find_lang %{name}
 
 %clean
@@ -95,25 +126,42 @@
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/gnome-screensaver-dialog
 %attr(755,root,root) %{_libdir}/gnome-screensaver
-%{_datadir}/%{name}
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/gnome-screensaver-preferences.glade
+%dir %{_datadir}/%{name}/themes
+%{_datadir}/%{name}/themes/cosmos-slideshow.desktop
+%{_datadir}/%{name}/themes/footlogo-floaters.desktop
+%{_datadir}/%{name}/themes/personal-slideshow.desktop
+%{_datadir}/%{name}/themes/popsquares.desktop
+%{_datadir}/%{name}/themes/cosmos
 %{_datadir}/desktop-directories/*
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*
 %{_sysconfdir}/gconf/schemas/gnome-screensaver.schemas
 %{_sysconfdir}/xdg/menus/*
 
+%files xscreensaver -f xscreensaver.files
+%defattr(644,root,root,755)
+
 %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.23.2.6  2006/08/08 19:03:13  havner
+- xscreensaver support (pregenerated desktop files based on
+  xscreensaver 4.24)
+- TODO
+- changelog fixed
+
 Revision 1.23.2.5  2006/08/08 17:11:52  havner
 - mutual obsoletes (gnome-screensaver<->xscreensaver-gnome2), those
   packages theoreticaly can coexist but gnome xdg-menus/control-center
   shows only one of them anyway (common Name) and it may be undefined
   what gnome lock button is going to use (besides gnome-screensaver will
   have support for xscreensaver hacks soon)
+- proper xscreensaver and gdm paths
 
 Revision 1.23.2.4  2006/05/31 19:18:35  freetz
 - 2.14.2, GNOME 2.14.2 deps
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-screensaver.spec?r1=1.23.2.5&r2=1.23.2.6&f=u