rpms/workrave/devel workrave-1.9.0-gcc44.patch, NONE, 1.1 workrave.spec, 1.20, 1.21

[Tomáš Mráz]

Author: tmraz

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

Modified Files:
	workrave.spec 
Added Files:
	workrave-1.9.0-gcc44.patch 
Log Message:
* Fri Feb 27 2009 Tomas Mraz <tmraz at redhat.com> - 1.9.0-3
- fix build with new gcc 4.4 and glibc


workrave-1.9.0-gcc44.patch:

--- NEW FILE workrave-1.9.0-gcc44.patch ---
diff -up workrave-1.9.0/backend/src/GlibIniConfigurator.cc.gcc44 workrave-1.9.0/backend/src/GlibIniConfigurator.cc
--- workrave-1.9.0/backend/src/GlibIniConfigurator.cc.gcc44	2008-03-07 22:38:26.000000000 +0100
+++ workrave-1.9.0/backend/src/GlibIniConfigurator.cc	2009-02-25 23:40:01.000000000 +0100
@@ -248,7 +248,7 @@ void
 GlibIniConfigurator::split_key(const string &key, string &group, string &out_key) const
 {
   const char *s = key.c_str();
-  char *slash = strchr(s, '/');
+  const char *slash = strchr(s, '/');
   if (slash)
     {
       group = key.substr(0, slash-s);


Index: workrave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/devel/workrave.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- workrave.spec	25 Feb 2009 19:06:55 -0000	1.20
+++ workrave.spec	27 Feb 2009 09:38:00 -0000	1.21
@@ -1,6 +1,6 @@
 Name: workrave
 Version: 1.9.0
-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+
@@ -8,6 +8,7 @@
 URL: http://workrave.sourceforge.net/
 # For some reason the upstream tarball contains the -3 added to the version.
 Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}-3.tar.gz
+Patch1: workrave-1.9.0-gcc44.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .gcc44
 
 %build
 if [ ! -x configure ]; then
@@ -74,8 +76,8 @@
 %{_datadir}/dbus-1/services/org.workrave.Workrave.service
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Fri Feb 27 2009 Tomas Mraz <tmraz at redhat.com> - 1.9.0-3
+- fix build with new gcc 4.4 and glibc
 
 * Fri Sep 26 2008 Tomas Mraz <tmraz at redhat.com> - 1.9.0-1
 - new upstream version