[workrave] - new upstream release hopefully fixing at least some of the aborts

[Tomáš Mráz]

commit 618d20d92a9a145bd7bcc3c5071c980462e62ab8
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Wed Nov 3 13:04:48 2010 +0100

    - new upstream release hopefully fixing at least some of the aborts

 workrave-1.9.1-abort.patch   |  197 ------------------------------------------
 workrave-1.9.1-compile.patch |   36 --------
 workrave-1.9.2-compile.patch |   12 +++
 workrave.spec                |   18 +++--
 4 files changed, 23 insertions(+), 240 deletions(-)
---
diff --git a/workrave-1.9.2-compile.patch b/workrave-1.9.2-compile.patch
new file mode 100644
index 0000000..3e72298
--- /dev/null
+++ b/workrave-1.9.2-compile.patch
@@ -0,0 +1,12 @@
+diff -up workrave-1.9.2/frontend/gtkmm/src/gnome_applet/Makefile.in.compile workrave-1.9.2/frontend/gtkmm/src/gnome_applet/Makefile.in
+--- workrave-1.9.2/frontend/gtkmm/src/gnome_applet/Makefile.in.compile	2010-11-03 12:52:59.000000000 +0100
++++ workrave-1.9.2/frontend/gtkmm/src/gnome_applet/Makefile.in	2010-08-28 14:58:33.000000000 +0200
+@@ -496,7 +496,7 @@ SUBDIRS = 
+ @HAVE_GNOMEAPPLET_TRUE@	 		 	  -DGNOMELOCALEDIR="\"$(datadir)/locale\"" 
+ 
+ @HAVE_GNOMEAPPLET_TRUE at workrave_applet_SOURCES = WorkraveApplet.c
+- at HAVE_GNOMEAPPLET_TRUE@workrave_applet_LDADD = @GNOME_LIBS@
++ at HAVE_GNOMEAPPLET_TRUE@workrave_applet_LDADD = @GNOME_LIBS@ @DBUS_LIBS@
+ @HAVE_GNOMEAPPLET_TRUE at workrave_applet_CXXFLAGS = ${FLAGS}
+ @HAVE_GNOMEAPPLET_TRUE at workrave_applet_CFLAGS = ${FLAGS}
+ @HAVE_GNOMEAPPLET_TRUE at BUILT_SOURCES = applet-server-bindings.h applet-client-bindings.h gui-client-bindings.h  Workrave-Applet.server Workrave-Applet.server.in
diff --git a/workrave.spec b/workrave.spec
index cdc799e..a9a852c 100644
--- a/workrave.spec
+++ b/workrave.spec
@@ -1,14 +1,13 @@
 Name: workrave
-Version: 1.9.1
-Release: 4%{?dist}
+Version: 1.9.2
+Release: 1%{?dist}
 Summary: Program that assists in the recovery and prevention of RSI
 # Based on older packages by Dag Wieers <dag at wieers.com> and Steve Ratcliffe
 License: GPLv2+
 Group: Applications/Productivity
-URL: http://workrave.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz
-Patch1: workrave-1.9.1-compile.patch
-Patch2: workrave-1.9.1-abort.patch
+URL: http://www.workrave.org/
+Source0: http://downloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz
+Patch1: workrave-1.9.2-compile.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext
@@ -20,8 +19,11 @@ BuildRequires:  libXmu-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXtst-devel
 BuildRequires:  dbus-devel
+BuildRequires:  dbus-glib-devel
 BuildRequires:  gstreamer-devel
 BuildRequires:  intltool
+BuildRequires:  python-cheetah
+BuildRequires:  pulseaudio-libs-devel
 
 Requires: dbus
 
@@ -33,7 +35,6 @@ take micro-pauses, rest breaks and restricts you to your daily limit.
 %prep
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .compile
-%patch2 -p1 -b .abort
 
 %build
 if [ ! -x configure ]; then
@@ -78,6 +79,9 @@ desktop-file-install --vendor fedora                    \
 %{_datadir}/dbus-1/services/org.workrave.Workrave.service
 
 %changelog
+* Wed Nov  3 2010 Tomas Mraz <tmraz at redhat.com> - 1.9.2-1
+- new upstream release hopefully fixing at least some of the aborts
+
 * Mon Apr 26 2010 Tomas Mraz <tmraz at redhat.com> - 1.9.1-4
 - better guard for BadWindow errors in input monitor (#566156)