rpms/workrave/devel workrave-1.9.1-compile.patch, NONE, 1.1 workrave.spec, 1.25, 1.26

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/workrave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27444

Modified Files:
	workrave.spec 
Added Files:
	workrave-1.9.1-compile.patch 
Log Message:
* Wed Mar 17 2010 Tomas Mraz <tmraz at redhat.com> - 1.9.1-3
- fix FTBFS (#564917)


workrave-1.9.1-compile.patch:
 gtkmm/src/gnome_applet/Makefile.in           |    2 +-
 plugin/exercises/gtkmm/src/ExercisesPanel.cc |    2 +-
 plugin/exercises/gtkmm/src/ExercisesPanel.hh |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE workrave-1.9.1-compile.patch ---
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 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
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);


Index: workrave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/devel/workrave.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- workrave.spec	28 Jan 2010 13:57:32 -0000	1.25
+++ workrave.spec	17 Mar 2010 22:51:38 -0000	1.26
@@ -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 <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
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext
@@ -30,6 +31,7 @@ take micro-pauses, rest breaks and restr
 
 %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 <tmraz at redhat.com> - 1.9.1-3
+- fix FTBFS (#564917)
+
 * Thu Jan 28 2010 Tomas Mraz <tmraz at redhat.com> - 1.9.1-2
 - do not build against gdome2 - not too useful optional feature