From b0fa1d12ffcda20264e4ed2263a228404ff0c4fc Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Wed, 9 Jun 2010 00:26:29 +0000
Subject: [PATCH] 2.31.3

---
 .cvsignore  |  2 +-
 sources     |  2 +-
 zenity.spec | 20 +++++---------------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 28a9c32..d5b6996 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-zenity-2.30.0.tar.bz2
+zenity-2.31.3.tar.bz2
diff --git a/sources b/sources
index d096c11..448f785 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15ba2f27d5e1a79c996e5e53e16f4380  zenity-2.30.0.tar.bz2
+d44388bf4d00b1c8a8e8d20366255f8c  zenity-2.31.3.tar.bz2
diff --git a/zenity.spec b/zenity.spec
index 4983f9a..b1ade6a 100644
--- a/zenity.spec
+++ b/zenity.spec
@@ -1,12 +1,12 @@
 Name:		zenity
-Version:	2.30.0
+Version:	2.31.3
 Release:	1%{?dist}
 Summary:	Display dialog boxes from shell scripts
 Group:		Applications/System
 License:	LGPLv2+
 URL:		http://directory.fsf.org/zenity.html
 #VCS: git:git://git.gnome.org/zenity
-Source:		http://download.gnome.org/sources/zenity/2.30/zenity-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/zenity/2.31/zenity-%{version}.tar.bz2
 
 BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: glib2-devel >= 2.7.3
@@ -18,13 +18,6 @@ BuildRequires: scrollkeeper
 BuildRequires: which
 BuildRequires: gettext
 BuildRequires: intltool
-# for /usr/share/gnome/help, we should require yelp
-# but we don't to avoid forcing firefox and libbeagle on live cds
-# via anaconda -> zenity -> ...
-#Requires: yelp
-
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
 
 %description
 Zenity lets you display Gtk+ dialog boxes from the command line and through
@@ -42,7 +35,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # we don't want a perl dependency just for this
@@ -64,14 +56,9 @@ for f in $helpdir/C/figures/*.png; do
   done
 done
 
-
 %find_lang zenity --with-gnome
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -f zenity.lang
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS NEWS THANKS README
@@ -81,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun  8 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.3-1
+- Update to 2.31.3
+
 * Mon Mar 29 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.0-1
 - Update to 2.30.0