rpms/gnome-screensaver/devel .cvsignore, 1.46, 1.47 gnome-screensaver-2.18.0-securitytoken.patch, 1.2, 1.3 gnome-screensaver.spec, 1.183, 1.184 sources, 1.49, 1.50

[William Jon McCann (mccann)]

Author: mccann

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11235

Modified Files:
	.cvsignore gnome-screensaver-2.18.0-securitytoken.patch 
	gnome-screensaver.spec sources 
Log Message:
- Update to snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	2 Apr 2008 16:23:16 -0000	1.46
+++ .cvsignore	14 May 2008 05:40:04 -0000	1.47
@@ -1 +1 @@
-gnome-screensaver-2.22.1.tar.bz2
+gnome-screensaver-2.23.3.tar.bz2

gnome-screensaver-2.18.0-securitytoken.patch:

Index: gnome-screensaver-2.18.0-securitytoken.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver-2.18.0-securitytoken.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-screensaver-2.18.0-securitytoken.patch	31 Jul 2007 01:42:29 -0000	1.2
+++ gnome-screensaver-2.18.0-securitytoken.patch	14 May 2008 05:40:04 -0000	1.3
@@ -2861,27 +2861,27 @@
  	$(NULL)
  
  gnome_screensaver_LDFLAGS = -export-dynamic
---- gnome-screensaver-2.18.0/configure.ac.securitytoken	2007-03-01 13:16:35.000000000 -0500
-+++ gnome-screensaver-2.18.0/configure.ac	2007-03-14 10:55:13.000000000 -0400
-@@ -44,6 +44,7 @@
- LIBEXIF_REQUIRED_VERSION=0.6.12
- GLIB_REQUIRED_VERSION=2.7.0
+--- gnome-screensaver-2.23.3/configure.ac.securitytoken	2008-05-14 01:20:13.000000000 -0400
++++ gnome-screensaver-2.23.3/configure.ac	2008-05-14 01:33:42.000000000 -0400
+@@ -45,6 +45,7 @@ GNOME_DESKTOP_REQUIRED_VERSION=2.23.2
+ 
+ GLADE_REQUIRED_VERSION=2.5.0
  LIBGNOMEKBDUI_REQUIRED_VERSION=0.1
 +NSS_REQUIRED_VERSION=3.11.2
  
  AC_CHECK_HEADERS(unistd.h)
  AC_CHECK_HEADERS(crypt.h sys/select.h)
-@@ -57,7 +58,8 @@
-         gtk+-2.0 >= $GTK_REQUIRED_VERSION
+@@ -59,7 +60,8 @@ PKG_CHECK_MODULES(GNOME_SCREENSAVER,
          dbus-glib-1 >= $DBUS_REQUIRED_VERSION
          gconf-2.0 >= $GCONF_REQUIRED_VERSION
+         gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
 -        libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION)
 +        libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION
-+	nss >= $NSS_REQUIRED_VERSION)
++        nss >= $NSS_REQUIRED_VERSION)
  AC_SUBST(GNOME_SCREENSAVER_CFLAGS)
  AC_SUBST(GNOME_SCREENSAVER_LIBS)
  
-@@ -92,8 +94,6 @@
+@@ -96,8 +98,6 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
  
  AM_GCONF_SOURCE_2
  
@@ -2890,7 +2890,7 @@
  # Solaris requires libresolv for daemon()
  case "$host" in
  	*-*-solaris*)
-@@ -227,6 +227,16 @@
+@@ -219,6 +219,16 @@ fi
  AM_CONDITIONAL(HAVE_USER_SWITCHING, test x$enable_user_switching = xyes)
  AC_SUBST(HAVE_USER_SWITCHING)
  


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- gnome-screensaver.spec	13 May 2008 17:54:43 -0000	1.183
+++ gnome-screensaver.spec	14 May 2008 05:40:04 -0000	1.184
@@ -7,27 +7,27 @@
 %define gconf2_version         2.6.1
 %define redhat_menus_version   5.0.1
 %define gnome_menus_version    2.11.1
+%define gnome_desktop_version  2.23.2
 %define libexif_version        0.6.12
 %define libgnomekbd_version    2.21
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.22.1
-Release: 2%{?dist}
+Version: 2.23.3
+Release: 0.2008.05.14.0%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
-Source0: http://download.gnome.org/sources/gnome-screensaver/2.22/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-screensaver/2.23/%{name}-%{version}.tar.bz2
 Source1: gnome-screensaver-hide-xscreensaver.menu
 
 Patch1: gnome-screensaver-2.20.0-default-theme.patch
 Patch2: gnome-screensaver-2.18.0-securitytoken.patch
 # add support for gnome-keyring to the pam stack
 Patch4: gnome-keyring.patch
-Patch6: gnome-screensaver-2.20.0-restore-gamma.patch
 Patch7: gnome-screensaver-2.20.0-blank-by-default.patch
 Patch8: gnome-screensaver-2.20.0-selinux-permit.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
 BuildRequires: gtk2-devel => %{gtk2_version}
 BuildRequires: libgnomeui-devel => %{libgnomeui_version}
@@ -37,6 +37,7 @@
 BuildRequires: libxml2-devel >= %{libxml2_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
+BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
 BuildRequires: libexif-devel >= %{libexif_version}
 BuildRequires: pam-devel
 BuildRequires: libX11-devel, libXScrnSaver-devel, libXext-devel
@@ -60,6 +61,7 @@
 Requires(preun): GConf2 >= %{gconf2_version}
 Requires(post): GConf2 >= %{gconf2_version}
 Requires: redhat-menus >= %{redhat_menus_version}
+Requires: gnome-desktop >= %{gnome_desktop_version}
 Requires: system-logos
 # since we use it, and pam spams the log if a module is missing
 Requires: gnome-keyring-pam
@@ -76,7 +78,6 @@
 %patch1 -p1 -b .use-floaters-by-default
 %patch2 -p1 -b .securitytoken
 %patch4 -p1 -b .gnome-keyring
-%patch6 -p1 -b .restore-gamma
 %patch7 -p1 -b .blank-by-default
 %patch8 -p1 -b .selinux-permit
 
@@ -145,6 +146,9 @@
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Wed May 14 2008 Jon McCann <jmccann at redhat.com> - 2.23.3-0.2008.05.14.0
+- Update to snapshot
+
 * Tue May 13 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.1-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	2 Apr 2008 16:23:16 -0000	1.49
+++ sources	14 May 2008 05:40:04 -0000	1.50
@@ -1 +1 @@
-d82d05ad4dc1ac827a12e0610d3d1833  gnome-screensaver-2.22.1.tar.bz2
+e1ff41c74e3acc3aa2a0f883e4a73077  gnome-screensaver-2.23.3.tar.bz2