rpms/rsibreak/devel rsibreak-0.9.0-cmake-find-plasma.patch, NONE, 1.1 rsibreak.spec, 1.10, 1.11
Kevin Kofler
kkofler at fedoraproject.org
Fri Feb 6 12:55:15 UTC 2009
Author: kkofler
Update of /cvs/pkgs/rpms/rsibreak/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5087/devel
Modified Files:
rsibreak.spec
Added Files:
rsibreak-0.9.0-cmake-find-plasma.patch
Log Message:
* Fri Feb 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.9.0-6
- fix build against KDE 4.2 (patch from Kubuntu)
rsibreak-0.9.0-cmake-find-plasma.patch:
--- NEW FILE rsibreak-0.9.0-cmake-find-plasma.patch ---
Index: rsibreak-0.9.0/CMakeLists.txt
===================================================================
--- rsibreak-0.9.0.orig/CMakeLists.txt 2009-01-13 14:46:43.000000000 -0500
+++ rsibreak-0.9.0/CMakeLists.txt 2009-01-13 14:47:12.000000000 -0500
@@ -3,19 +3,13 @@
find_package (KDE4 REQUIRED)
include(KDE4Defaults)
-macro_optional_find_package(Plasma)
-
-macro_log_feature(PLASMA_FOUND "Plasma" "Plasma libraries and header files" "http://plasma.kde.org/" FALSE "" "Plasma is needed for Plasma applet of rsibreak. Install kdebase-workspace.")
-
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
include_directories ( ${KDE4_INCLUDES} ${BLITZ_INCLUDES} )
ADD_SUBDIRECTORY( icons )
ADD_SUBDIRECTORY( src )
-if (PLASMA_FOUND)
- ADD_SUBDIRECTORY( plasma )
-endif (PLASMA_FOUND)
+ADD_SUBDIRECTORY( plasma )
find_package(Msgfmt REQUIRED)
find_package(Gettext REQUIRED)
add_subdirectory( po )
Index: rsibreak-0.9.0/plasma/CMakeLists.txt
===================================================================
--- rsibreak-0.9.0.orig/plasma/CMakeLists.txt 2009-01-13 14:48:34.000000000 -0500
+++ rsibreak-0.9.0/plasma/CMakeLists.txt 2009-01-13 14:48:56.000000000 -0500
@@ -8,7 +8,7 @@
rsibreak_interface)
kde4_add_plugin(plasma_engine_rsibreak ${rsibreak_engine_SRCS})
-target_link_libraries(plasma_engine_rsibreak ${PLASMA_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(plasma_engine_rsibreak ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
install(TARGETS plasma_engine_rsibreak DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-engine-rsibreak.desktop DESTINATION ${SERVICES_INSTALL_DIR})
@@ -17,7 +17,7 @@
rsibreak.cpp)
kde4_add_plugin(plasma_applet_rsibreak ${rsibreak_applet_SRCS})
-target_link_libraries(plasma_applet_rsibreak ${PLASMA_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(plasma_applet_rsibreak ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
install(TARGETS plasma_applet_rsibreak DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-applet-rsibreak.desktop DESTINATION ${SERVICES_INSTALL_DIR})
Index: rsibreak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsibreak/devel/rsibreak.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rsibreak.spec 6 Feb 2009 12:49:41 -0000 1.10
+++ rsibreak.spec 6 Feb 2009 12:54:44 -0000 1.11
@@ -7,12 +7,12 @@
License: GPLv2+
URL: http://www.rsibreak.org
Source0: http://rsibreak.org/files/rsibreak-%{version}.tar.bz2
+# Patch to build against KDE 4.2, by Scott Kitterman from Kubuntu
+Patch0: rsibreak-0.9.0-cmake-find-plasma.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# note, build fails with kde >= 4.2, since plasma moved into kdelibs and
-# CMakeLists.txt macros/usage need updating
BuildRequires: kdelibs4-devel desktop-file-utils gettext
-BuildRequires: plasma-devel
+BuildRequires: plasma-devel >= 4.2
%description
RSIBreak is a small utility which bothers you at certain intervals. The
@@ -23,6 +23,7 @@
%prep
%setup -q
+%patch0 -p1 -b .find-plasma
%build
mkdir -p %{_target_platform}
@@ -76,6 +77,9 @@
%{_libdir}/kde4/plasma_applet_rsibreak.so
%changelog
+* Fri Feb 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.9.0-6
+- fix build against KDE 4.2 (patch from Kubuntu)
+
* Wed Jan 21 2009 Roland Wolters <wolters.liste at gmx.net> 0.9.0-5
- added doc/HTML dir
More information about the fedora-extras-commits
mailing list