rpms/kdeplasma-addons/F-11 kdeplasma-addons-4.2.4-no_bluemarble.patch, NONE, 1.1 kdeplasma-addons.spec, 1.34, 1.35

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25683

Modified Files:
	kdeplasma-addons.spec 
Added Files:
	kdeplasma-addons-4.2.4-no_bluemarble.patch 
Log Message:
* Thu Jun 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.4-2
- drop bluemarble applet


kdeplasma-addons-4.2.4-no_bluemarble.patch:

--- NEW FILE kdeplasma-addons-4.2.4-no_bluemarble.patch ---
diff -up kdeplasma-addons-4.2.4/applets/CMakeLists.txt.no_bluemarble kdeplasma-addons-4.2.4/applets/CMakeLists.txt
--- kdeplasma-addons-4.2.4/applets/CMakeLists.txt.no_bluemarble	2009-01-06 11:24:01.000000000 -0600
+++ kdeplasma-addons-4.2.4/applets/CMakeLists.txt	2009-06-18 08:56:42.000000000 -0500
@@ -2,15 +2,6 @@
 # this works also for the weatherutils include dir, but should be done properly, Alex
 include_directories(${PLASMACLOCK_INCLUDE_DIR})
 
-if(KDE4_PLASMA_OPENGL_FOUND)
-  message(STATUS "libplasma supports OpenGL applets")
-  if(NOT WIN32)
-    add_subdirectory(bluemarble)
-  endif(NOT WIN32)
-else(KDE4_PLASMA_OPENGL_FOUND)
-  message(STATUS "libplasma doesn't support OpenGL applets")
-endif(KDE4_PLASMA_OPENGL_FOUND)
-
 add_subdirectory(bball)
 add_subdirectory(binary-clock)
 add_subdirectory(calculator)


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-11/kdeplasma-addons.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- kdeplasma-addons.spec	31 May 2009 14:29:50 -0000	1.34
+++ kdeplasma-addons.spec	18 Jun 2009 13:59:01 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -14,6 +14,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch0:         kdeplasma-addons-4.2.1-lancelot-qt45.patch
 # http://bugzilla.redhat.com/497659
 Patch1:         kdeplasma-addons-4.2.3-rssnow_qt451_hack.patch
+# omit bluemarble
+Patch2:         kdeplasma-addons-4.2.4-no_bluemarble.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  gettext
@@ -54,6 +56,7 @@ Additional plasmoids for KDE.
 %patch0 -p0 -b .lancelot-qt45
 %patch1 -p1 -b .rssnow_qt451_hack
 %endif
+%patch2 -p1 -b .no_bluemarble
 
 
 %build
@@ -104,7 +107,6 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/bball/
 %{_kde4_appsdir}/desktoptheme/*
 %{_kde4_appsdir}/plasma/services/*
-%{_kde4_appsdir}/plasma-bluemarble/
 %{_kde4_appsdir}/rssnow/
 %{_kde4_datadir}/config/comic.knsrc
 %{_kde4_datadir}/kde4/services/*.desktop
@@ -121,6 +123,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jun 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.4-2
+- drop bluemarble applet
+
 * Sun May 31 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
 - KDE 4.2.4