SPECS: gnome-screensaver.spec - 2.15.6, merged havner's masterpiec...

[freetz]

Author: freetz                       Date: Thu Aug 10 18:17:07 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 2.15.6, merged havner's masterpiece from AC-branch, you rule dude!

---- Files affected:
SPECS:
   gnome-screensaver.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: SPECS/gnome-screensaver.spec
diff -u SPECS/gnome-screensaver.spec:1.31 SPECS/gnome-screensaver.spec:1.32
--- SPECS/gnome-screensaver.spec:1.31	Tue Aug  8 19:12:41 2006
+++ SPECS/gnome-screensaver.spec	Thu Aug 10 20:17:01 2006
@@ -2,33 +2,36 @@
 Summary:	GNOME screensaver
 Summary(pl):	Wygaszacz ekranu GNOME
 Name:		gnome-screensaver
-Version:	2.15.5
+Version:	2.15.6
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.15/%{name}-%{version}.tar.bz2
-# Source0-md5:	a756ad73fce75f213b754786e0c75853
+# Source0-md5:	fad605326dc2e922264bdea96bfa981f
 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
 BuildRequires:	OpenGL-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	dbus-glib-devel >= 0.62
+BuildRequires:	dbus-glib-devel >= 0.71
 BuildRequires:	gnome-common >= 2.12.0
-BuildRequires:	gnome-menus-devel >= 2.15.90
-BuildRequires:	gnome-vfs2-devel >= 2.15.90
+BuildRequires:	gnome-menus-devel >= 2.15.91
+BuildRequires:	gnome-vfs2-devel >= 2.15.91
 BuildRequires:	gtk+2-devel >= 2:2.10.1
 BuildRequires:	intltool >= 0.35
 BuildRequires:	libexif-devel >= 1:0.6.13
 BuildRequires:	libglade2 >= 1:2.6.0
-BuildRequires:	libgnomeui-devel >= 2.15.90
+BuildRequires:	libgnomeui-devel >= 2.15.91
 BuildRequires:	libtool
 BuildRequires:	pam-devel
 BuildRequires:	pkgconfig
+BuildRequires:	xmlto
 Requires(post,preun):   GConf2 >= 2.14.0
-Requires:	libgnomeui >= 2.15.90
+Requires:	libgnomeui >= 2.15.91
 Requires:	xdg-menus
 Obsoletes:	xscreensaver-gnome2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -41,8 +44,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
 
@@ -76,6 +92,17 @@
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gnome-screensaver
 
+_DIR=$(pwd)
+cd %{name}-xscreensaver
+# this one is provided by gnome-screensaver
+rm -f 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
@@ -110,6 +137,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2006/08/10 18:17:01  freetz
+- 2.15.6, merged havner's masterpiece from AC-branch, you rule dude!
+
 Revision 1.31  2006/08/08 17:12:41  havner
 - O: xscreensaver-gnome2
 
================================================================

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