rpms/kdebase3/devel kdebase-3.5.9-libkrdb_dep.patch, NONE, 1.1 kdebase3.spec, 1.60, 1.61

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10651/devel

Modified Files:
	kdebase3.spec 
Added Files:
	kdebase-3.5.9-libkrdb_dep.patch 
Log Message:
fix kcm_color build (with awol krdb)
omit kcm_samba, kcm_locale too


kdebase-3.5.9-libkrdb_dep.patch:

--- NEW FILE kdebase-3.5.9-libkrdb_dep.patch ---
diff -up kdebase-3.5.9/kcontrol/colors/Makefile.am.krdb_dep kdebase-3.5.9/kcontrol/colors/Makefile.am
--- kdebase-3.5.9/kcontrol/colors/Makefile.am.krdb_dep	2006-03-17 04:17:17.000000000 -0600
+++ kdebase-3.5.9/kcontrol/colors/Makefile.am	2008-05-16 10:51:31.000000000 -0500
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_colors.la
 
 kcm_colors_la_SOURCES = colorscm.cpp widgetcanvas.cpp 
 kcm_colors_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
-kcm_colors_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/kcontrol/krdb/libkrdb.la
+kcm_colors_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
 METASOURCES = colorscm.moc widgetcanvas.moc
 
 noinst_HEADERS = colorscm.h widgetcanvas.h


Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kdebase3.spec	16 May 2008 15:12:53 -0000	1.60
+++ kdebase3.spec	16 May 2008 15:54:08 -0000	1.61
@@ -86,6 +86,8 @@
 # modified version of kubuntu_9915_userdiskmount.diff
 # fixes NTFS (#378041) and adds PolicyKit support (#428212)
 Patch36: kdebase-3.5.9-userdiskmount.patch
+# don't link kcm_colors against libkrdb
+Patch37: kdebase-3.5.9-libkrdb_dep.patch
 
 # upstream patches
 # alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
@@ -322,6 +324,7 @@
 %if 0%{?fedora} > 7
 %patch36 -p1 -b .userdiskmount
 %endif
+%patch37 -p1 -b .libkrdb_dep
 
 ## alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
 #patch200 -p4 -b .kde#83974
@@ -332,9 +335,12 @@
 # hacks to omit stuff that doesn't support DO_NOT_COMPILE
 # colors is pending on http://bugzilla.redhat.com/443343
 sed -i.omit -e 's|^FONTINST_SUBDIR=kfontinst|#FONTINST_SUBDIR=kfontinst|' \
-  -e 's/background//' -e 's/clock//' -e 's/display//' -e 's/energy//' -e 's/fonts//' \
-  -e 's/kdm//' -e 's/kicker//' -e 's/krdb//' -e 's/kthememanager//' -e 's/screensaver//' \
-  -e 's/taskbar//' -e 's/xinerama//' kcontrol/Makefile.am
+  -e 's/background//' -e 's/clock//' -e 's/display//' -e 's/energy//' \
+  -e 's/fonts//' -e 's/icons//' \
+  -e 's/kdm//' -e 's/kicker//' -e 's/krdb//' -e 's/kthememanager//' \
+  -e 's/locale//' \
+  -e 's/screensaver//' -e 's/style//' -e 's/taskbar//' -e 's/xinerama//' \
+  kcontrol/Makefile.am
 %endif
 
 # security fixes