From 044fafe70b298ff502e0757ce5a3320e94ad5a1b Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Dec 19 2005 16:19:18 +0000
Subject: Add floaters lock dialog


---

diff --git a/.cvsignore b/.cvsignore
index 553fd51..5d0a4f6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 gnome-screensaver-0.0.20.tar.bz2
 gnome-screensaver-0.0.22.tar.bz2
+fedoralogo-floaters-lock-dialog.tar.gz
diff --git a/gnome-screensaver.spec b/gnome-screensaver.spec
index daecc09..79eeea6 100644
--- a/gnome-screensaver.spec
+++ b/gnome-screensaver.spec
@@ -11,12 +11,17 @@
 Summary: GNOME Sreensaver
 Name: gnome-screensaver
 Version: 0.0.22
-Release: 2
+Release: 3
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
 Source1: gnome-screensaver-hide-xscreensaver.menu
-Source2: gnome-compiler-flags.m4
+Source2: fedoralogo-floaters-lock-dialog.tar.gz
+Source3: gnome-compiler-flags.m4
+
+Patch0: gnome-screensaver-0.0.22-floaters.patch
+Patch1: gnome-screensaver-0.0.22-lock-dialog.patch
+
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gnome.org
 BuildRequires: gtk2-devel => %{gtk2_version}
@@ -40,7 +45,6 @@ Requires: libxml2 >= %{libxml2_version}
 Requires: GConf2 >= %{gconf2_version}
 Requires: redhat-menus >= %{redhat_menus_version}
 
-Patch0: gnome-screensaver-0.0.22-floaters.patch
 
 %description
 gnome-screensaver is a screen saver and locker that aims to have
@@ -49,11 +53,14 @@ simple, sane, secure defaults and be well integrated with the desktop.
 %prep
 %setup -q
 %patch0 -p1 -b .floaters
+%patch1 -p1 -b .lock-dialog
+
+tar xzf %{SOURCE2}
 
 %build
 intltoolize --force
 aclocal
-cat %{SOURCE2} >> aclocal.m4
+cat %{SOURCE3} >> aclocal.m4
 automake
 autoconf
 %configure --with-xscreensaverdir=/usr/share/xscreensaver/config \
@@ -79,6 +86,9 @@ desktop-file-install --vendor gnome --delete-original                   \
 # hide xscreensaver from the menus
 install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/preferences-post-merged/gnome-screensaver-hide-xscreensaver.menu
 
+# install floaters lock dialog
+cp fedoralogo-floaters-lock-dialog* $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver/themes
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -105,6 +115,9 @@ done
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Mon Dec 19 2005 Matthias Clasen <mclasen@redhat.com> - 0.0.22-3
+- add floaters lock dialog
+
 * Sun Dec 18 2005 Ray Strode <rstrode@redhat.com> - 0.0.22-2
 - add floaters screensaver
 
diff --git a/sources b/sources
index 581a671..e8861aa 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 0acbd685877365d425849d80dc96c074  gnome-screensaver-0.0.22.tar.bz2
+98d49c78c060314f372bf95f406fad28  fedoralogo-floaters-lock-dialog.tar.gz