diff --git a/workrave-1.9.1-compile.patch b/workrave-1.9.1-compile.patch new file mode 100644 index 0000000..484438b --- /dev/null +++ b/workrave-1.9.1-compile.patch @@ -0,0 +1,36 @@ +diff -up workrave-1.9.1/frontend/gtkmm/src/gnome_applet/Makefile.in.compile workrave-1.9.1/frontend/gtkmm/src/gnome_applet/Makefile.in +--- workrave-1.9.1/frontend/gtkmm/src/gnome_applet/Makefile.in.compile 2009-10-25 12:15:02.000000000 +0100 ++++ workrave-1.9.1/frontend/gtkmm/src/gnome_applet/Makefile.in 2010-03-17 23:35:53.000000000 +0100 +@@ -490,7 +490,7 @@ SUBDIRS = + @HAVE_GNOMEAPPLET_TRUE@ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" + + @HAVE_GNOMEAPPLET_TRUE@workrave_applet_SOURCES = WorkraveApplet.c +-@HAVE_GNOMEAPPLET_TRUE@workrave_applet_LDADD = @GNOME_LIBS@ ++@HAVE_GNOMEAPPLET_TRUE@workrave_applet_LDADD = @GNOME_LIBS@ @DBUS_LIBS@ + @HAVE_GNOMEAPPLET_TRUE@workrave_applet_CXXFLAGS = ${FLAGS} + @HAVE_GNOMEAPPLET_TRUE@workrave_applet_CFLAGS = ${FLAGS} + @HAVE_GNOMEAPPLET_TRUE@BUILT_SOURCES = applet-server-bindings.h applet-client-bindings.h gui-client-bindings.h +diff -up workrave-1.9.1/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc.compile workrave-1.9.1/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc +--- workrave-1.9.1/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc.compile 2009-09-18 20:46:22.000000000 +0200 ++++ workrave-1.9.1/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc 2010-03-17 22:45:49.000000000 +0100 +@@ -210,7 +210,7 @@ text_buffer_set_markup (GtkTextBuffer *b + + int ExercisesPanel::exercises_pointer = 0; + +-ExercisesPanel::ExercisesPanel(Gtk::HButtonBox *dialog_action_area) ++ExercisesPanel::ExercisesPanel(Gtk::ButtonBox *dialog_action_area) + : Gtk::HBox(false, 6), + exercises(Exercise::get_exercises()) + { +diff -up workrave-1.9.1/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh.compile workrave-1.9.1/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh +--- workrave-1.9.1/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh.compile 2009-05-28 21:04:02.000000000 +0200 ++++ workrave-1.9.1/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh 2010-03-17 22:46:01.000000000 +0100 +@@ -43,7 +43,7 @@ + class ExercisesPanel : public Gtk::HBox + { + public: +- ExercisesPanel(Gtk::HButtonBox *dialog_action_area); ++ ExercisesPanel(Gtk::ButtonBox *dialog_action_area); + ~ExercisesPanel(); + + void set_exercise_count(int num); diff --git a/workrave.spec b/workrave.spec index 2f8095e..731a3ea 100644 --- a/workrave.spec +++ b/workrave.spec @@ -1,12 +1,13 @@ Name: workrave Version: 1.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext @@ -30,6 +31,7 @@ take micro-pauses, rest breaks and restricts you to your daily limit. %prep %setup -q -n %{name}-%{version} +%patch1 -p1 -b .compile %build if [ ! -x configure ]; then @@ -74,6 +76,9 @@ desktop-file-install --vendor fedora \ %{_datadir}/dbus-1/services/org.workrave.Workrave.service %changelog +* Wed Mar 17 2010 Tomas Mraz - 1.9.1-3 +- fix FTBFS (#564917) + * Thu Jan 28 2010 Tomas Mraz - 1.9.1-2 - do not build against gdome2 - not too useful optional feature