[gnome-screensaver/f15/master] 2.91.92

[Matthias Clasen]

commit 5d2ace3cbd027216ee3b48114e2483973ca1bc42
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Mon Mar 21 22:39:02 2011 -0400

    2.91.92

 .gitignore             |    1 +
 gnome-screensaver.spec |   17 ++++++-----------
 sources                |    2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index da569df..83496ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ gnome-screensaver-2.30.0.tar.bz2
 /gnome-screensaver-2.91.4.tar.bz2
 /gnome-screensaver-2.91.90.tar.bz2
 /gnome-screensaver-2.91.91.tar.bz2
+/gnome-screensaver-2.91.92.tar.bz2
diff --git a/gnome-screensaver.spec b/gnome-screensaver.spec
index f8c4efa..d9f3184 100644
--- a/gnome-screensaver.spec
+++ b/gnome-screensaver.spec
@@ -13,13 +13,12 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.91.91
+Version: 2.91.92
 Release: 1%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 #VCS: git:git://git.gnome.org/gnome-screensaver
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.91/%{name}-%{version}.tar.bz2
-Source1: gnome-screensaver-hide-xscreensaver.menu
 
 Patch8: gnome-screensaver-2.20.0-selinux-permit.patch
 
@@ -67,10 +66,7 @@ simple, sane, secure defaults and be well integrated with the desktop.
 autoreconf -f -i
 
 %build
-%configure --with-xscreensaverdir=/usr/share/xscreensaver/config \
-           --with-xscreensaverhackdir=/usr/libexec/xscreensaver  \
-           --with-gdm-config=/usr/share/gdm/defaults.conf        \
-           --with-mit-screensaver=no
+%configure --with-mit-ext=no
 make
 
 %install
@@ -78,22 +74,21 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name}
 
-# hide xscreensaver from the menus
-install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/preferences-post-merged/gnome-screensaver-hide-xscreensaver.menu
-
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc AUTHORS NEWS README COPYING
 %{_bindir}/*
 %{_libexecdir}/*
 %{_libdir}/pkgconfig/*
-%{_sysconfdir}/xdg/menus/preferences-post-merged/*
 %{_sysconfdir}/pam.d/*
 %{_sysconfdir}/xdg/autostart/gnome-screensaver.desktop
-%{_datadir}/dbus-1/services/org.gnome.ScreenSaver.service
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Mon Mar 21 2011 Matthias Clasen <mclasen at redhat.com> - 2.91.92-1
+- Update to 2.91.92
+- Spec file cleanups
+
 * Tue Mar  8 2011 Christopher Aillon <caillon at redhat.com> - 2.91.91-1
 - Update to 2.91.91
 
diff --git a/sources b/sources
index 24af069..ab59a22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eda4ec43761b6d29d922828716b3e064  gnome-screensaver-2.91.91.tar.bz2
+28900e707b1897a8c1cae6600d9db2a4  gnome-screensaver-2.91.92.tar.bz2