rpms/kdebase/F-8 kdebase-3.5.9-libkrdb_dep.patch, NONE, 1.1 env.sh, 1.5, 1.6 kdebase.spec, 1.296, 1.297

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12213

Modified Files:
	env.sh kdebase.spec 
Added Files:
	kdebase-3.5.9-libkrdb_dep.patch 
Log Message:
sync w/ kdebase3/devel branch, and...

* Fri May 23 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-14.1
- don't set XDG_CONFIG_DIRS (#249109)


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: env.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-8/env.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- env.sh	15 May 2007 19:11:53 -0000	1.5
+++ env.sh	23 May 2008 13:23:42 -0000	1.6
@@ -1,11 +1,5 @@
 ## from http://standards.freedesktop.org/menu-spec/latest/
 
-# XDG_CONFIG_DIRS: where to look for menu config(s)
-if [ -z "${XDG_CONFIG_DIRS}" ] ; then
-   XDG_CONFIG_DIRS=/etc/kde/xdg:/etc/xdg
-   export XDG_CONFIG_DIRS
-fi
-
 # XDG_MENU_PREFIX
 if [ -z "${XDG_MENU_PREFIX}" ] ; then
    XDG_MENU_PREFIX="kde-"


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-8/kdebase.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- kdebase.spec	16 Apr 2008 13:44:12 -0000	1.296
+++ kdebase.spec	23 May 2008 13:23:42 -0000	1.297
@@ -12,7 +12,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.9
-Release: 10%{?dist}.1
+Release: 14%{?dist}.1
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -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,9 @@
 %if 0%{?fedora} > 7
 %patch36 -p1 -b .userdiskmount
 %endif
+%if "%{name}" != "kdebase"
+%patch37 -p1 -b .libkrdb_dep
+%endif
 
 ## alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
 #patch200 -p4 -b .kde#83974
@@ -330,7 +335,14 @@
 
 %if "%{name}" != "kdebase"
 # hacks to omit stuff that doesn't support DO_NOT_COMPILE
-sed -i -e 's|^FONTINST_SUBDIR=kfontinst|#FONTINST_SUBDIR=kfontinst|' -e 's/kicker//' -e 's/taskbar//' kcontrol/Makefile.am
+# 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/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
@@ -550,7 +562,7 @@
       konsolesu.desktop krandrtray.desktop ksysguard.desktop ktip.desktop \
       kwrite.desktop KControl.desktop
 
-perl -pi -e "s,OnlyShowIn=KDE,Hidden=true," *
+sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," *.desktop
 popd
 
 # remove all crsystalsvg icons for now
@@ -719,6 +731,7 @@
 %{?_with_libutempter:%attr(2755,root,utempter) }%{_bindir}/konsole
 %{_bindir}/krandom.kss
 %{_bindir}/krandrtray
+%{_bindir}/krdb
 %{_bindir}/kreadconfig
 %{_bindir}/ksmserver
 %{_bindir}/ksplashsimple
@@ -794,7 +807,6 @@
 %{_bindir}/kjobviewer
 %{_bindir}/klocaldomainurifilterhelper
 %{_bindir}/kprinter
-%{_bindir}/krdb
 %{_datadir}/applications/*/*
 %{_datadir}/apps/*
 %{_datadir}/icons/*color/*/*/*
@@ -855,6 +867,15 @@
 
 
 %changelog
+* Fri May 23 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-14.1
+- don't set XDG_CONFIG_DIRS (#249109)
+
+* Fri May 16 2008 Rex Dieter <rdieter at fedoraprojecdt.org> - 3.5.9-14
+- f9+: omit extraneous kcontrol modules (#446575)
+
+* Wed May 14 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-12
+- kcontrol modules appearing in gnome "Other" menu (#446466)
+
 * Mon Apr 14 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-10.1
 - create/own: /var/lib/kdm (#442081)