rpms/kdebase3/devel kdebase3.spec,1.25,1.26

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdebase3.spec 
Log Message:
* Wed Jan 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.8-33
- don't omit all of kcontrol (kcms are used by several applications)


Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kdebase3.spec	23 Jan 2008 16:40:59 -0000	1.25
+++ kdebase3.spec	23 Jan 2008 20:31:34 -0000	1.26
@@ -15,7 +15,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.8
-Release: 32%{?dist}
+Release: 33%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -318,6 +318,11 @@
 %patch202 -p4 -b .gtk212
 %patch203 -p0 -b .gcc43
 
+%if "%{name}" != "kdebase"
+# hacks to omit stuff that doesn't support DO_NOT_COMPILE
+sed -i -e 's|^FONTINST_SUBDIR=kfontinst|#FONTINST_SUBDIR=kfontinst|' kcontrol/Makefile.am
+%endif
+
 # security fixes
 
 %if %redhatify
@@ -341,8 +346,9 @@
 export DO_NOT_COMPILE="kappfinder kdesktop klipper kdm kmenuedit kpager kpersonalizer ktip nsplugins"
 export DO_NOT_COMPILE="$DO_NOT_COMPILE kate konqueror kscreensaver ksysguard knetattach kwin"
 export DO_NOT_COMPILE="$DO_NOT_COMPILE kdesu kdialog kicker ksplashml khelpcenter kxkb"
-export DO_NOT_COMPILE="$DO_NOT_COMPILE khotkeys kdepasswd kcheckpass drkonqi kcontrol"
-# export DO_NOT_COMPILE="$DO_NOT_COMPILE ksonsole kioslave"
+export DO_NOT_COMPILE="$DO_NOT_COMPILE khotkeys kdepasswd kcheckpass drkonqi"
+# Keep these (kcontrol for kcms, konsole for KonsolePart, kioslave for ioslaves)
+# export DO_NOT_COMPILE="$DO_NOT_COMPILE kcontrol konsole kioslave"
 %endif
 
 %configure \
@@ -799,6 +805,9 @@
 
 
 %changelog
+* Wed Jan 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.8-33
+- don't omit all of kcontrol (kcms are used by several applications)
+
 * Wed Jan 23 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.8-32
 - (re)enable --with-samba support (now that we have a GPLv3-compat qt)