rpms/gnome-screensaver/devel fedoralogo-floaters.desktop, NONE, 1.1 .cvsignore, 1.10, 1.11 gnome-screensaver.spec, 1.37, 1.38 sources, 1.10, 1.11 gnome-screensaver-0.0.22-floaters.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9922

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Added Files:
	fedoralogo-floaters.desktop 
Removed Files:
	gnome-screensaver-0.0.22-floaters.patch 
Log Message:
- Update to 0.0.23
- remove floaters screensaver engine patch (it's upstreamed)
- keep fedora branded parts



--- NEW FILE fedoralogo-floaters.desktop ---
[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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	19 Dec 2005 16:19:18 -0000	1.10
+++ .cvsignore	20 Dec 2005 21:39:42 -0000	1.11
@@ -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


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gnome-screensaver.spec	19 Dec 2005 16:19:18 -0000	1.37
+++ gnome-screensaver.spec	20 Dec 2005 21:39:42 -0000	1.38
@@ -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: 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 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .floaters
-%patch1 -p1 -b .lock-dialog
+%patch0 -p1 -b .lock-dialog
 
 tar xzf %{SOURCE2}
 
@@ -85,10 +85,11 @@
 
 # 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 @@
 %{_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 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue Dec 20 2005 Ray Strode <rstrode at 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 at redhat.com> - 0.0.22-3
 - add floaters lock dialog
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	19 Dec 2005 16:19:18 -0000	1.10
+++ sources	20 Dec 2005 21:39:42 -0000	1.11
@@ -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


--- gnome-screensaver-0.0.22-floaters.patch DELETED ---