rpms/kdebase3/devel kdebase3.spec,1.16,1.17

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdebase3.spec 
Log Message:
* 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 kicker klipper kdm kmenuedit kpager kpersonalizer kscreensaver ktip nsplugins"
- include %_libdir/libkdeinit_*.* only in main pkg (not -libs or -devel)



Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kdebase3.spec	5 Jan 2008 11:56:05 -0000	1.16
+++ kdebase3.spec	8 Jan 2008 15:35:29 -0000	1.17
@@ -22,7 +22,7 @@
 %endif
 
 Version: 3.5.8
-Release: 28%{?dist}
+Release: 29%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -343,6 +343,15 @@
 # HACK for rhel4
 #PATH=$PATH:/usr/X11R6/bin; export PATH
 
+%if "%{name}" != "kdebase"
+## I'm pretty sure on these -- Rex 
+export DO_NOT_COMPILE="kappfinder kdesktop klipper kdm kmenuedit kpager kpersonalizer ktip nsplugins"
+## add more of these when we're ready to (potentially) break some rawhide deps -- Rex
+#export DO_NOT_COMPILE="$DO_NOT_COMPILE kate konqueror konsole kscreensaver ksysguard kwin"
+## these too?  not sure
+#export DO_NOT_COMPILE="$DO_NOT_COMPILE kcontrol kdesu kdialog kicker"
+%endif
+
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -486,7 +495,7 @@
 # remove conflicts with kdebase-workspace
 pushd %{buildroot}%{_bindir}
 rm -f genkdmconf kaccess kappfinder kapplymousetheme kate kbookmarkmerger \
-      kblankscrn.kss kcminit kcminit_startup kcontroledit kdebugdialog \
+      kblankscrn.kss kcheckrunning kcminit kcminit_startup kcontroledit kdebugdialog \
       kdeinstallktheme kdepasswd kdialog kdm kdmctl keditbookmarks \
       keditfiletype kfind kfmclient khelpcenter khotkeys kinfocenter klipper \
       kmenuedit konqueror konsole krandom.kss krandrtray kreadconfig ksmserver \
@@ -503,6 +512,7 @@
 rm -f %{buildroot}%{_datadir}/config.kcfg/klaunch.kcfg
 rm -f %{buildroot}%{_datadir}/config.kcfg/konqueror.kcfg
 rm -f %{buildroot}%{_datadir}/config.kcfg/kwin.kcfg
+rm -f %{buildroot}%{_datadir}/config/klipperrc
 rm -f %{buildroot}%{_datadir}/config/kshorturifilterrc
 rm -f %{buildroot}%{_datadir}/xsessions/kde.desktop
 # remove docs
@@ -698,6 +708,16 @@
 %{_bindir}/nspluginscan
 %{_bindir}/nspluginviewer
 %{_bindir}/startkde
+# these just moved out of kdebase3 -- Rex
+%{_bindir}/kcheckrunning
+%{_bindir}/kdesktop
+%{_bindir}/kdesktop_lock
+%{_bindir}/kdm_config
+%{_bindir}/kdm_greet
+%{_bindir}/kpm
+%{_bindir}/krootimage
+%{_bindir}/kwebdesktop
+# 
 %{_datadir}/autostart/*
 %{_datadir}/desktop-directories/*
 %{_datadir}/locale/*/entry.desktop
@@ -706,10 +726,6 @@
 %{_datadir}/templates/*
 %{_datadir}/templates/.source/*
 %{_datadir}/wallpapers/*
-%else
-# We don't have kdebase-extras in kdebase3
-%{_bindir}/kpager
-%{_bindir}/kpersonalizer
 %endif
 
 %config(noreplace) /etc/xdg/menus/*
@@ -720,17 +736,12 @@
 %{_bindir}/extensionproxy
 %{_bindir}/kasbar
 %{_bindir}/kcheckpass
-%{_bindir}/kcheckrunning
 %{_bindir}/kcontrol
 %{_bindir}/kdcop
 %{_bindir}/kdeeject
 %{_bindir}/kdeprintfax
-%{_bindir}/kdesktop
-%{_bindir}/kdesktop_lock
 %{_bindir}/kdesu
 %{_bindir}/kdesud
-%{_bindir}/kdm_config
-%{_bindir}/kdm_greet
 %{_bindir}/kfontinst
 %{_bindir}/kfontview
 %{_bindir}/khc_docbookdig.pl
@@ -745,14 +756,11 @@
 %{_bindir}/klocaldomainurifilterhelper
 %{_bindir}/knetattach
 %{_bindir}/kompmgr
-%{_bindir}/kpm
 %{_bindir}/kprinter
 %{_bindir}/krdb
-%{_bindir}/krootimage
 %{_bindir}/ksplash
-%{_bindir}/kwebdesktop
 %{_bindir}/mailsettings
-%{_libdir}/libkdeinit_*.so
+%{_libdir}/libkdeinit_*.*
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin
 %{_datadir}/applications/*/*
@@ -777,6 +785,7 @@
 %endif
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.la
+%exclude %{_libdir}/libkdeinit_*.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -790,10 +799,15 @@
 %dir %{_includedir}/kde/ksplash
 %{_includedir}/kde/ksplash/*
 %{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit_*.so
+%exclude %{_libdir}/libkdeinit_*.*
 
 
 %changelog
+* 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 kicker klipper kdm kmenuedit kpager kpersonalizer kscreensaver ktip nsplugins"
+- include %%_libdir/libkdeinit_*.* only in main pkg (not -libs or -devel)
+
 * Sat Jan 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.8-28
 - apply upstream build fix for GCC 4.3 (--enable-final macro redefinition)