rpms/kdebase3/devel kdebase3.spec,1.19,1.20

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdebase3.spec 
Log Message:
* Wed Jan 09 2008 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-30
- f9+: omit kcontrol/kfontinst



Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kdebase3.spec	8 Jan 2008 16:16:19 -0000	1.19
+++ kdebase3.spec	9 Jan 2008 13:25:05 -0000	1.20
@@ -22,7 +22,7 @@
 %endif
 
 Version: 3.5.8
-Release: 29%{?dist}
+Release: 30%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -320,6 +320,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
@@ -497,7 +502,7 @@
 rm -f genkdmconf kaccess kappfinder kapplymousetheme kate kbookmarkmerger \
       kblankscrn.kss kcheckrunning kcminit kcminit_startup kcontroledit kdebugdialog \
       kdeinstallktheme kdepasswd kdialog kdm kdmctl keditbookmarks \
-      keditfiletype kfind kfmclient khelpcenter khotkeys kinfocenter klipper \
+      keditfiletype kfind kfmclient kfontinst kfontview khelpcenter khotkeys kinfocenter klipper \
       kmenuedit konqueror konsole krandom.kss krandrtray kreadconfig ksmserver \
       ksplashsimple kstart ksysguard ksysguardd ksystraycmd ktip ktrash kwin \
       kwin_killer_helper kwin_rules_dialog kwrite kwriteconfig kxkb \
@@ -714,6 +719,8 @@
 %{_bindir}/kdesktop_lock
 %{_bindir}/kdm_config
 %{_bindir}/kdm_greet
+%{_bindir}/kfontinst
+%{_bindir}/kfontview
 %{_bindir}/krootimage
 %{_bindir}/kwebdesktop
 # 
@@ -741,8 +748,6 @@
 %{_bindir}/kdeprintfax
 %{_bindir}/kdesu
 %{_bindir}/kdesud
-%{_bindir}/kfontinst
-%{_bindir}/kfontview
 %{_bindir}/khc_docbookdig.pl
 %{_bindir}/khc_htdig.pl
 %{_bindir}/khc_htsearch.pl
@@ -803,6 +808,9 @@
 
 
 %changelog
+* Wed Jan 09 2008 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-30
+- f9+: omit kcontrol/kfontinst
+
 * Tue Jan 08 2008 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-29
 - f9+: omit conflicts w/kdebase-workspace-4.0.0
 - f9+: DO_NOT_COMPILE="kappfinder kdesktop klipper kdm kmenuedit kpager kpersonalizer kscreensaver ktip nsplugins"