rpms/kdebase/F-8 kdebase.spec, 1.288, 1.289 KDE.session.gnome, 1.1, NONE kderc, 1.1, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdebase.spec 
Removed Files:
	KDE.session.gnome kderc 
Log Message:
Sync from devel:
* Wed Feb 27 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-2
- f9+: don't omit all of khelpcenter, some is needed for kde3 apps' help

and bump to 3.5.9-3.


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-8/kdebase.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- kdebase.spec	28 Feb 2008 16:39:25 -0000	1.288
+++ kdebase.spec	28 Feb 2008 18:26:31 -0000	1.289
@@ -1,10 +1,7 @@
 %define debug 0 
 %define final 1 
-
 %define redhatify 1
-
 %define make_cvs 1
-
 %define arts 1
 
 %if 0%{?fedora} > 7
@@ -15,7 +12,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -41,7 +38,6 @@
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
 
 Source1: konsole.desktop
-Source2: KDE.session.gnome
 
 Source5: kde-np.pamd
 Source6: logrotate-kdm
@@ -50,7 +46,6 @@
 Source9: cr16-app-package_games_kids.png
 Source10: cr32-app-package_games_kids.png
 Source11: cr48-app-package_games_kids.png
-Source12: kderc
 
 Source50:   kde-np-legacy.pamd
 Source1001: kde.pamd
@@ -202,9 +197,8 @@
 BuildRequires: OpenEXR-devel
 BuildRequires: gtk2-devel
 
-
-%description
 %if "%{name}" == "kdebase"
+%description
 Core applications for the K Desktop Environment.  Included are: kdm
 (replacement for xdm), kwin (window manager), konqueror (filemanager,
 web browser, ftp client, ...), konsole (xterm replacement), kpanel
@@ -214,6 +208,7 @@
 components (kcheckpass, kikbd, kscreensaver, kcontrol, kfind,
 kfontmanager, kmenuedit).
 %else
+%description
 Core runtime files for the K Desktop Environment 3, for compatibility with KDE 3
 applications.
 %endif
@@ -330,7 +325,7 @@
 %if "%{name}" != "kdebase"
 export DO_NOT_COMPILE="kappfinder kdesktop klipper kdm kmenuedit kpager kpersonalizer ktip nsplugins"
 export DO_NOT_COMPILE="$DO_NOT_COMPILE konqueror kscreensaver ksysguard knetattach kwin"
-export DO_NOT_COMPILE="$DO_NOT_COMPILE kdialog kicker ksplashml khelpcenter kxkb"
+export DO_NOT_COMPILE="$DO_NOT_COMPILE kdialog kicker ksplashml kxkb"
 export DO_NOT_COMPILE="$DO_NOT_COMPILE khotkeys kdepasswd kcheckpass drkonqi"
 # Keep these (kcontrol for kcms, konsole for KonsolePart, kioslave for ioslaves,
 # kate for kscope, kdesu until we figure out what to do about it)
@@ -480,7 +475,8 @@
 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 kfontinst kfontview khelpcenter khotkeys kinfocenter klipper \
+      keditfiletype kfind kfmclient kfontinst kfontview khelpcenter khc_* \
+      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 \
@@ -797,9 +793,12 @@
 
 
 %changelog
-* Thu Feb 28 2008 Than Ngo <than at redhat.com> 3.5.9-2
+* Thu Feb 28 2008 Than Ngo <than at redhat.com> 3.5.9-3
 - apply upstream patch to unbreak lmsensors support again
 
+* Wed Feb 27 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-2
+- f9+: don't omit all of khelpcenter, some is needed for kde3 apps' help
+
 * Thu Feb 14 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-1
 - kde-3.5.9
 - fixup startkde patch, omitting broken bits, for now (#426871)


--- KDE.session.gnome DELETED ---


--- kderc DELETED ---