diff --git a/gcc-45.diff b/gcc-45.diff new file mode 100644 index 0000000..47d33b0 --- /dev/null +++ b/gcc-45.diff @@ -0,0 +1,22 @@ +--- src/rsitimer.cpp.sav 2009-07-19 15:35:42.000000000 +0200 ++++ src/rsitimer.cpp 2010-02-15 15:43:33.921351095 +0100 +@@ -490,7 +490,7 @@ void RSITimer::readConfig() + m_ignoreIdleForTinyBreaks = config.readEntry( "IgnoreIdleForTinyBreaks", false ); + + config = KGlobal::config()->group( "General" ); +- m_lastrunDt = config.readEntry( "LastRunTimeStamp", QDateTime::QDateTime() ); ++ m_lastrunDt = config.readEntry( "LastRunTimeStamp", QDateTime() ); + m_lastrunTiny = config.readEntry( "LastRunTinyLeft", 0 ); + m_lastrunBig = config.readEntry( "LastRunBigLeft", 0 ); + } +--- src/CMakeLists.txt.sav 2009-07-19 15:35:42.000000000 +0200 ++++ src/CMakeLists.txt 2010-02-15 15:42:29.005358277 +0100 +@@ -49,7 +49,7 @@ breakcontrol.cpp + + QT4_ADD_DBUS_ADAPTOR( rsibreak_sources + org.rsibreak.rsiwidget.xml +-rsiwidget.h RSIObject::RSIObject ++rsiwidget.h RSIObject + ) + + # compilation diff --git a/rsibreak.changes b/rsibreak.changes index 1538f90..a6660d4 100644 --- a/rsibreak.changes +++ b/rsibreak.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 15 14:46:24 UTC 2010 - llunak@novell.com + +- fix build with gcc-4.5 + ------------------------------------------------------------------- Fri Jul 24 20:14:00 CEST 2009 - toma@kde.org diff --git a/rsibreak.spec b/rsibreak.spec index f315a53..777b37a 100644 --- a/rsibreak.spec +++ b/rsibreak.spec @@ -1,7 +1,7 @@ # # spec file for package rsibreak (Version 0.10) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,15 +20,16 @@ Name: rsibreak BuildRequires: kdebase4-workspace-devel -License: GPL v2 or later +License: GPLv2+ Url: http://www.kde-apps.org/content/show.php?content=29725 Group: Productivity/Other BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Assists in the Recovery and Prevention of Repetitive Strain Injury Version: 0.10 -Release: 1 +Release: 2 %define tar_version 0.10 Source: rsibreak-%tar_version.tar.bz2 +Patch1: gcc-45.diff Provides: kde4-rsibreak = 0.9.0 Obsoletes: kde4-rsibreak <= 0.9.0 %kde4_runtime_requires @@ -47,6 +48,7 @@ Authors: %prep %setup -n rsibreak-%tar_version -q +%patch1 %build %cmake_kde4 -d build