diff --git a/.cvsignore b/.cvsignore index f25367a..9312871 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -okteta-0.0.9-780093.tar.bz2 +okteta-0.0.9-786572.tar.bz2 diff --git a/okteta-0.0.9-kde40.patch b/okteta-0.0.9-kde40.patch new file mode 100644 index 0000000..e57358a --- /dev/null +++ b/okteta-0.0.9-kde40.patch @@ -0,0 +1,24 @@ +diff -ur okteta-0.0.9-786572/program/about.cpp okteta-0.0.9-786572-kde40/program/about.cpp +--- okteta-0.0.9-786572/program/about.cpp 2008-03-18 13:30:06.000000000 +0100 ++++ okteta-0.0.9-786572-kde40/program/about.cpp 2008-03-18 13:55:33.000000000 +0100 +@@ -41,7 +41,6 @@ + ki18n("Copyright 2006-2008 Friedrich W. H. Kossebau"), //copyright + ki18n("Edit files as streams of bytes") ) // comment + { +- addLicense(KAboutData::License_GPL_V3); + setOrganizationDomain( "kde.org" ); + addAuthor( ki18n("Friedrich W. H. Kossebau"), // name + ki18n("Author"), // task +diff -ur okteta-0.0.9-786572/program/libkakao/controllers/shellwindow/fullscreen/fullscreencontroller.cpp okteta-0.0.9-786572-kde40/program/libkakao/controllers/shellwindow/fullscreen/fullscreencontroller.cpp +--- okteta-0.0.9-786572/program/libkakao/controllers/shellwindow/fullscreen/fullscreencontroller.cpp 2008-03-18 13:30:05.000000000 +0100 ++++ okteta-0.0.9-786572-kde40/program/libkakao/controllers/shellwindow/fullscreen/fullscreencontroller.cpp 2008-03-18 13:47:13.000000000 +0100 +@@ -47,5 +47,8 @@ + + void FullScreenController::switchFullScreen( bool toFullScreen ) + { +- KToggleFullScreenAction::setFullScreen( mMainWindow, toFullScreen ); ++ if( toFullScreen ) ++ mMainWindow->setWindowState( mMainWindow->windowState() | Qt::WindowFullScreen ); ++ else ++ mMainWindow->setWindowState( mMainWindow->windowState() & ~Qt::WindowFullScreen ); + } diff --git a/okteta.spec b/okteta.spec index 4c4401c..851cd9f 100644 --- a/okteta.spec +++ b/okteta.spec @@ -1,9 +1,9 @@ -%define revision 780093 +%define revision 786572 Summary: Binary editor Name: okteta Version: 0.0.9 -Release: 0.1.20080228svn%{revision}%{?dist} +Release: 0.2.20080318svn%{revision}%{?dist} Group: Applications/Editors # GPLv2 or GPLv3 or later as approved by KDE e.V. @@ -11,6 +11,8 @@ License: GPLv2 or GPLv3 URL: http://frinring.wordpress.com/category/okteta/ # checked out from svn://anonsvn.kde.org/home/kde/trunk/playground/utils/okteta Source0: %{name}-%{version}-%{revision}.tar.bz2 +# fix build with kdelibs 4.0.x +Patch0: okteta-0.0.9-kde40.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake @@ -24,6 +26,7 @@ either hex or ASCII. Okteta uses the KDE 4 libraries. %prep %setup -q -n %{name}-%{version}-%{revision} +%patch0 -p1 %build %cmake_kde4 . @@ -66,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT %{_kde4_datadir}/kde4/services/oktetapart.desktop %changelog +* Tue Mar 18 2008 Kevin Kofler 0.0.9-0.2.20080318svn786572 +- Update to revision 786572 +- Add patch to fix build with kdelibs 4.0.x + * Thu Feb 28 2008 Kevin Kofler 0.0.9-0.1.20080228svn780093 - Update to revision 780093 (adds undo/redo support) - Update License tag (now GPLv2 or GPLv3 instead of GPLv2 only) diff --git a/sources b/sources index 0d5321f..81ca709 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ed218c67375a9a03f6180d293e1c32c4 okteta-0.0.9-780093.tar.bz2 +342467fd480a456c951040f23533f5b8 okteta-0.0.9-786572.tar.bz2