From b15481e8d3c77badad4e339e38b60a4188dba7c4 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Dec 20 2005 21:39:42 +0000
Subject: - Update to 0.0.23

- remove floaters screensaver engine patch (it's upstreamed)
- keep fedora branded parts

---

diff --git a/.cvsignore b/.cvsignore
index 5d0a4f6..dda0fec 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 gnome-screensaver-0.0.20.tar.bz2
 gnome-screensaver-0.0.22.tar.bz2
 fedoralogo-floaters-lock-dialog.tar.gz
+gnome-screensaver-0.0.23.tar.bz2
diff --git a/fedoralogo-floaters.desktop b/fedoralogo-floaters.desktop
new file mode 100644
index 0000000..720dbba
--- /dev/null
+++ b/fedoralogo-floaters.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Floating Fedora Bubbles
+Comment=Bubbles the Fedora logo around the screen
+Exec=floaters /usr/share/pixmaps/fedora-logo-sprite.svg
+TryExec=floaters
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=GNOME;Screensaver
diff --git a/gnome-screensaver.spec b/gnome-screensaver.spec
index 79eeea6..baeea4d 100644
--- a/gnome-screensaver.spec
+++ b/gnome-screensaver.spec
@@ -7,20 +7,21 @@
 %define libxml2_version        2.6.0
 %define gconf2_version         2.6.1
 %define redhat_menus_version   5.0.1
+%define system_logos_version   1.1.37
 
 Summary: GNOME Sreensaver
 Name: gnome-screensaver
-Version: 0.0.22
-Release: 3
+Version: 0.0.23
+Release: 1
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
 Source1: gnome-screensaver-hide-xscreensaver.menu
 Source2: fedoralogo-floaters-lock-dialog.tar.gz
 Source3: gnome-compiler-flags.m4
+Source4: fedoralogo-floaters.desktop
 
-Patch0: gnome-screensaver-0.0.22-floaters.patch
-Patch1: gnome-screensaver-0.0.22-lock-dialog.patch
+Patch0: gnome-screensaver-0.0.22-lock-dialog.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gnome.org
@@ -44,7 +45,7 @@ Requires: libglade2 >= %{libglade2_version}
 Requires: libxml2 >= %{libxml2_version}
 Requires: GConf2 >= %{gconf2_version}
 Requires: redhat-menus >= %{redhat_menus_version}
-
+Requires: fedora-logos >= %{system_logos_version}
 
 %description
 gnome-screensaver is a screen saver and locker that aims to have
@@ -52,8 +53,7 @@ simple, sane, secure defaults and be well integrated with the desktop.
 
 %prep
 %setup -q
-%patch0 -p1 -b .floaters
-%patch1 -p1 -b .lock-dialog
+%patch0 -p1 -b .lock-dialog
 
 tar xzf %{SOURCE2}
 
@@ -85,10 +85,11 @@ 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
 
+install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver/themes
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -107,7 +108,7 @@ done
 %{_datadir}/applications/gnome-screensaver-preferences.desktop
 %{_datadir}/gnome-screensaver/*
 %{_datadir}/pixmaps/backgrounds/*
-%{_datadir}/pixmaps/fedora-logo-sprite.svg
+%{_datadir}/pixmaps/*
 %{_datadir}/desktop-directories/gnome-screensaver.directory
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_sysconfdir}/xdg/menus/preferences-post-merged/*
@@ -115,6 +116,11 @@ done
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue Dec 20 2005 Ray Strode <rstrode@redhat.com> - 0.0.23-1
+- Update to 0.0.23
+- remove floaters screensaver engine patch (it's upstreamed)
+- keep fedora branded parts
+
 * Mon Dec 19 2005 Matthias Clasen <mclasen@redhat.com> - 0.0.22-3
 - add floaters lock dialog
 
diff --git a/sources b/sources
index e8861aa..af19b10 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0acbd685877365d425849d80dc96c074  gnome-screensaver-0.0.22.tar.bz2
-98d49c78c060314f372bf95f406fad28  fedoralogo-floaters-lock-dialog.tar.gz
+42b838e47d43ab2b08539c6a2bbefa28  gnome-screensaver-0.0.23.tar.bz2
+3f0250f7f2b0de901ddc3760a4f942b6  fedoralogo-floaters-lock-dialog.tar.gz