rpms/kdebase-workspace/devel kdebase-workspace-4.2.85-knotificationitem-1.patch, NONE, 1.1 kdebase-workspace.spec, 1.219, 1.220

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3333

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.85-knotificationitem-1.patch 
Log Message:
fix build issue if knotificationitem-1 is not installed


kdebase-workspace-4.2.85-knotificationitem-1.patch:

--- NEW FILE kdebase-workspace-4.2.85-knotificationitem-1.patch ---
diff -up kdebase-workspace-4.2.85/kcontrol/CMakeLists.txt.knotificationitem-1 kdebase-workspace-4.2.85/kcontrol/CMakeLists.txt
--- kdebase-workspace-4.2.85/kcontrol/CMakeLists.txt.knotificationitem-1	2008-12-04 09:34:47.000000000 +0100
+++ kdebase-workspace-4.2.85/kcontrol/CMakeLists.txt	2009-05-15 17:24:56.000000000 +0200
@@ -1,13 +1,14 @@
 macro_optional_find_package(Freetype)
 macro_log_feature(FREETYPE_FOUND "FreeType" "A font rendering engine" "http://www.freetype.org" FALSE "" "Needed to build kfontinst, a simple font installer.")
 
-
+macro_optional_find_package(LibKNotificationItem-1)
 set(libkxftconfig_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/fonts/kxftconfig.cpp )
 
-
-if( X11_Xrandr_FOUND )
-   add_subdirectory( randr )
-endif(X11_Xrandr_FOUND )
+if(LIBKNOTIFICATIONITEM-1_FOUND)
+  if(X11_Xrandr_FOUND)
+    add_subdirectory( randr )
+  endif(X11_Xrandr_FOUND)
+endif(LIBKNOTIFICATIONITEM-1_FOUND)
 
 if(X11_Xkb_FOUND)
     add_subdirectory( kxkb )


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -p -r1.219 -r1.220
--- kdebase-workspace.spec	12 May 2009 13:08:26 -0000	1.219
+++ kdebase-workspace.spec	15 May 2009 15:30:00 -0000	1.220
@@ -29,6 +29,7 @@ Patch12: kdebase-workspace-4.2.0-default
 Patch13: kdebase-workspace-4.2.0-pykde4.patch
 Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
 Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
+Patch16: kdebase-workspace-4.2.85-knotificationitem-1.patch
 
 # upstream patches:
 # trunk
@@ -70,7 +71,7 @@ BuildRequires: soprano-devel
 BuildRequires: python-devel
 BuildRequires: qedje-devel
 BuildRequires: polkit-qt-devel
-BuildRequires: kdelibs-experimental-devel
+#BuildRequires: kdelibs-experimental-devel
 # used for the Logitech mouse KCM, disabled until #399931 is fixed
 # BuildRequires: libusb-devel
 
@@ -215,6 +216,7 @@ Requires: PyKDE4 >= %{version}
 %patch13 -p1 -b .pykde4
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo
+%patch16 -p1 -b .knotificationitem-1
 
 # upstream patches