Sat Dec 1 20:00:37 UTC 2007

Author: kkofler

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

Modified Files:
	kdebase.spec 
Removed Files:
	KDE.session.gnome env.sh kde-legacy.pamd kde-np-legacy.pamd 
	kde-np.pamd kde.desktop kde.pamd kdebase-3.1-startpage.patch 
	kdebase-3.1.3-konsole-double-esc.patch 
	kdebase-3.2.0-keymap.patch kdebase-3.2.92-logo.patch 
	kdebase-3.3.1-pam_krb5-bz#191049.patch 
	kdebase-3.3.92-kpersonalizer.patch kdebase-3.3.92-vroot.patch 
	kdebase-3.4.2-kdesktop-konsole.patch 
	kdebase-3.5.1-kdm-readme.patch 
	kdebase-3.5.1-konsole-fonts.patch kdebase-3.5.1-xdg.patch 
	kdebase-3.5.2-kconf_update-klipper.patch 
	kdebase-3.5.3-khelpcenter-sort.patch kdebase-3.5.4-htdig.patch 
	kdebase-3.5.4-konqueror-shortcut.patch 
	kdebase-3.5.4-tango-icon-theme.patch kdebase-3.5.5-dbus.patch 
	kdebase-3.5.5-keyinit.patch kdebase-3.5.5-redhat-pam.patch 
	kdebase-3.5.5-suspend.patch 
	kdebase-3.5.6-kdm-alternatebackground.patch 
	kdebase-3.5.7-kde#83974.patch 
	kdebase-3.5.7-kio_media_mounthelper.patch 
	kdebase-3.5.7-konsolesu.patch 
	kdebase-3.5.8-consolekit-kdm.patch 
	kdebase-3.5.8-gdm-socket.patch 
	kdebase-3.5.8-konsole-bz#244906.patch 
	kdebase-3.5.8-redhat-startkde.patch 
	kdebase-3.x-shortcuts.patch kderc konsole.desktop 
	logrotate-kdm mailsettings.cc 
Log Message:
Sync from kdebase4 (kdebase 3.96.0).


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.278 -r 1.279 kdebase.spec
Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279

--- kdebase.spec	28 Nov 2007 22:43:39 -0000	1.278
+++ kdebase.spec	1 Dec 2007 20:00:03 -0000	1.279
@@ -1,2450 +1,402 @@
 
-%define debug 0 
-%define final 1 
+Summary:       K Desktop Environment 4 - Core Files
+Version:       3.96.0
+Release:       4%{?dist}
+
+%if 0%{?fedora} > 9
+Name:          kdebase
+Epoch:         6
 
-%define redhatify 1
-%define kde_settings 1
+Obsoletes:     kdebase4 < %{version}-%{release}
+Provides:      kdebase4 = %{version}-%{release}
 
-%define make_cvs 1
-
-%define arts 1
-
-%if 0%{?fedora} > 7
-# make -libs subpkg
-%define libs 1
-%endif
-
-Summary: K Desktop Environment - core files
-Name:    kdebase
-Epoch:   6
-Version: 3.5.8
-Release: 9%{?dist}
-
-# programs: GPLv2, libs: LGPLv2
-License: GPLv2
-Url: http://www.kde.org
-Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-
-Source1: konsole.desktop
-Source2: KDE.session.gnome
-Source3: kde.desktop
-Source4: kde-redhat-config-3.5-fc7-1.tar.bz2
-Source5: kde-np.pamd
-Source6: logrotate-kdm
-Source7: mailsettings.cc
-Source8: env.sh
-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
-Source1002: kde-legacy.pamd
-
-Patch0: kdebase-3.5.5-redhat-pam.patch
-Patch1: kdebase-%{version}-redhat-startkde.patch
-Patch2: kdebase-3.3.92-vroot.patch
-Patch3: kdebase-3.x-shortcuts.patch
-Patch4: kdebase-3.2.0-keymap.patch
-Patch5: kdebase-3.1-startpage.patch
-Patch6: kdebase-3.1.3-konsole-double-esc.patch
-Patch7: kdebase-3.3.92-kpersonalizer.patch
-Patch8: kdebase-3.2.92-logo.patch 
-Patch10: kdebase-3.4.2-kdesktop-konsole.patch
-Patch11: kdebase-3.5.1-xdg.patch
-Patch13: kdebase-3.5.5-dbus.patch
-Patch14: kdebase-3.5.1-kdm-readme.patch
-Patch15: kdebase-3.5.1-konsole-fonts.patch
-Patch18: kdebase-3.5.2-kconf_update-klipper.patch
-Patch20: kdebase-3.5.5-keyinit.patch
-Patch21: kdebase-3.5.3-khelpcenter-sort.patch
-Patch22: kdebase-3.5.4-htdig.patch
-Patch24: kdebase-3.5.4-tango-icon-theme.patch
-Patch25: kdebase-3.5.4-konqueror-shortcut.patch
-Patch26: kdebase-3.5.5-suspend.patch
-Patch27: kdebase-3.5.8-consolekit-kdm.patch
-Patch28: kdebase-3.5.6-kdm-alternatebackground.patch
-# FIXME? (still needed?) -- Rex
-Patch29: kdebase-3.5.8-konsole-bz#244906.patch
-Patch30: kdebase-3.5.7-kio_media_mounthelper.patch
-Patch31: kdebase-3.5.7-konsolesu.patch
-
-# upstream patches
-# alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
-Patch200: kdebase-3.5.7-kde#83974.patch
-%if 0%{?fedora} > 7
-# http://bugs.kde.org/show_bug.cgi?id=149045
-Patch201: kdebase-3.5.8-gdm-socket.patch
-%endif
-
-# security fixes
-
-Provides: kdebase3 = %{version}-%{release}
-
-%if 0%{?libs}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 %else
-Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Name:          kdebase4
 %endif
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires(post): coreutils fileutils
-Requires(postun): coreutils fileutils
-# See http://bugzilla.redhat.com/191306
-Requires(hint): htdig
-# man2html
-Requires(hint): man
-# /sbin/fuser
-Requires: psmisc
-# startkde references: which, xargs
-Requires: findutils
-Requires: which
-
+License:       GPLv2
+Group:         User Interface/Desktops
+URL:           http://www.kde.org/
+Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: kde-filesystem
+%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+Requires(post): /sbin/ldconfig xdg-utils
+Requires(postun): /sbin/ldconfig xdg-utils
+Requires: kdelibs4 >= %{version}
+Requires: kdepimlibs >= %{version}
+Requires: kdebase-runtime >= %{version}
 %ifnarch s390 s390x
 Requires: eject
 %endif
 
-# upgrade path for former kde-redhat'ers
-Obsoletes: %{name}-kdm < %{epoch}:%{version}-%{release}
-Provides:  %{name}-kdm = %{epoch}:%{version}-%{release}
-
-%if %{kde_settings}
-Requires: kde-settings
-# when/if -kdm is ever packaged separately
-Requires: kde-settings-kdm
-%else
-Requires: xorg-x11-xdm
-Requires: desktop-backgrounds-basic
-Requires: redhat-menus => 6.7.5
-Requires: redhat-artwork-kde >= 7.0.0-8
-%endif
+# should not conflict with d3lphin, but does with old Dolphin
+Conflicts:     dolphin <= 0.8.2
 
-BuildRequires: kdelibs3-devel >= %{version}
-BuildRequires: libxslt-devel libxml2-devel
-%if 0%{?fedora} > 6
-BuildRequires: libsmbclient-devel
-%else
-BuildRequires: samba 
-%endif
-BuildRequires: pam-devel
-BuildRequires: gettext
-BuildRequires: perl
-BuildRequires: sed
-%if %{make_cvs}
-BuildRequires: automake libtool
-%endif
-BuildRequires: pkgconfig
-BuildRequires: doxygen
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%ifarch %{ix86} x86_64 ia64 ppc ppc64
-%define _with_suspend 1
-Requires: pm-utils
-%endif
-%define _with_hal --with-hal
-# dbus >= 0.90, hal >= 0.5 (mock/yum is having problems groking this for me on el5/x86_64) -- Rex
-BuildRequires: dbus-devel hal-devel
-%endif
-BuildRequires: freetype-devel
-BuildRequires: openldap-devel
+# FIXME: remove BRs which are only needed for stuff now in -runtime
+BuildRequires: alsa-lib-devel
+BuildRequires: bzip2-devel
+# needed?
+BuildRequires: cdparanoia-devel cdparanoia
+BuildRequires: cmake
 BuildRequires: cyrus-sasl-devel
+BuildRequires: doxygen
+BuildRequires: fontconfig-devel
+BuildRequires: gettext
+BuildRequires: hal-devel
+BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: kdepimlibs-devel >= %{version}
[...2396 lines suppressed...]
-* Tue Jun 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot
-- ExcludeArch ia64 for now
-- remove gnome .desktop file, we get it from gnome-core now.
-
-* Wed Apr  5 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- remove dependency on xpm (now in XFree86)
-
-* Sat Mar 18 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot
-- move it to /usr, where it belongs
-
-* Sat Dec 25 1999 Bernhard Rosenkraenzer <bero at redhat.com>
-- Build the OpenGL screensavers, and move them to a separate package
-- Improve the spec file (BuildPrereqs etc.)
-
-* Thu Dec 16 1999 Bernhard Rosenkraenzer <bero at redhat.com>
-- remove patch #3 (obsoleted by kwin)
-
-* Sun Oct 24 1999 Bernhard Rosenkraenzer <bero at redhat.de>
-- 2.0 CVS snapshot
-- fix compilation
-
-* Thu Sep 23 1999 Preston Brown <pbrown at redhat.com>
-- clean up files in /tmp from startkde
-- mark doc files as such
-
-* Tue Sep 21 1999 Preston Brown <pbrown at redhat.com>
-- start autorun if present in startkde
-- check for configured soundcard before running sound services
-
-* Mon Sep 20 1999 Preston Brown <pbrown at redhat.com>
-- made kdelnks display Name property if they are of type Link
-
-* Thu Sep 16 1999 Preston Brown <pbrown at redhat.com>
-- moved png handling here (from kdelibs)
-- changed low color icon directory name to locolor
-
-* Tue Sep 14 1999 Preston Brown <pbrown at redhat.com>
-- added optional session management to logout dialog
-- include GNOME menus
-
-* Mon Sep 13 1999 Preston Brown <pbrown at redhat.com>
-- added link to /etc/X11/applnk, .directory file
-- included lowcolor icon sub-package
-- enable .desktop file access
-
-* Fri Sep 10 1999 Preston Brown <pbrown at redhat.com>
-- customized startkde script to set up user environment if not present.
-- mention kthememgr in description.
-
-* Wed Sep 08 1999 Preston Brown <pbrown at redhat.com>
-- upgraded to 1.1.2 release
-- kvt is back
-- kde icon included
-- linux console fonts included
-
-* Thu Jul 15 1999 Preston Brown <pbrown at redhat.com>
-- PAM console logout problem solved.
-
-* Mon Jul 12 1999 Preston Brown <pbrown at redhat.com>
-- now includes screensaver password security fix
-
-* Fri Jun 11 1999 Preston Brown <pbrown at redhat.com>
-- snapshot, includes kde 1.1.1 + fixes
-- kvt removed for security reasons.  It is a steaming pile of...
-
-* Mon Apr 19 1999 Preston Brown <pbrown at redhat.com> 
-- last snapshot before release
-
-* Fri Apr 16 1999 Preston Brown <pbrown at redhat.com>
-- today's snapshot makes kfm a bit nicer and some other fixes
-- moved default rc files to kdesupport
-
-* Thu Apr 15 1999 Preston Brown <pbrown at redhat.com>
-- SUID bit removed from konsole_grantpty -- not needed w/glibc 2.1
-
-* Wed Apr 14 1999 Preston Brown <pbrown at redhat.com>
-- built with today's snapshot -- had to rebuild to fix pam problems.
-
-* Tue Apr 13 1999 Preston Brown <pbrown at redhat.com>
-- new snapshot fixes mimetype video/x-flic problem
-
-* Mon Apr 12 1999 Preston Brown <pbrown at redhat.com>
-- latest stable snapshot
-
-* Fri Apr 09 1999 Preston Brown <pbrown at redhat.com>
-- removed bell.xpm (used to be in fvwm2-icons, don't want installer to see
-- this previous connection and autoselect kdebase for upgrade).
-
-* Tue Mar 23 1999 Preston Brown <pbrown at redhat.com>
-- moved gdm patch
-
-* Mon Mar 22 1999 Preston Brown <pbrown at redhat.com>
-- added gdm session control file
-
-* Fri Mar 19 1999 Preston Brown <pbrown at redhat.com>
-- added pam-console stuff to kde pam file
-
-* Wed Feb 24 1999 Preston Brown <pbrown at redhat.com>
-- Injected new description and group.
-
-* Mon Feb 07 1999 Preston Brown <pbrown at redhat.com>
-- upgraded to KDE 1.1 final.
-
-* Tue Jan 19 1999 Preston Brown <pbrown at redhat.com>
-- updated macros for RPM 3.0, removed red hat logo.
 
-* Tue Jan 05 1999 Preston Brown <pbrown at redhat.com>
-- re-merged from Duncan Haldane's stuff
+* Mon Jul 30 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.92.0-3
+- bump rss-glx Conflicts because the conflict is still there in 0.8.1.p-7.fc8
+- rss-glx conflict only needed if "%%{_prefix}" == "/usr"
+- consolekit_kdm patch only needs BR dbus-devel, not ConsoleKit-devel
+
+* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-2
+- consolekit_kdm patch (#228111, kde#147790)
+- update startkde patch
+
+* Sat Jul 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-1
+- kde-3.92 (kde-4-beta1)
+
+* Wed Jul 25 2007 Than Ngo <than at redhat.com> - 3.91.0-6
+- fix startkde
+- add env/shutdown directory
+
+* Thu Jul 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-5
+- kde4.desktop: fix session Name
+
+* Tue Jul 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-4
+- cleanup/fix kde4.desktop
+- kdepimlibs4->kdepimlibs
+
+* Thu Jun 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-3
+- fix %%_sysconfdir for %%_prefix != /usr case.
+
+* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-2
+- updated kde4home.diff
+- CMAKE_BUILD_TYPE=RelWithDebInfo (we're already using %%optflags)
+
+* Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-1
+- kde-3.91.0
+- CMAKE_BUILD_TYPE=debug
+
+* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.90.1-2
+- specfile cleanup (%%prefix issues mostly)
+
+* Sun May 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.90.1-1
+- update to 3.90.1
+- bump cmake BR to 2.4.5 as required upstream now
+- don't set execute bits by hand anymore, cmake has been fixed
+- use multilibs in /opt/kde4
+- add BR openssl-devel, NetworkManager-devel, bluez-libs-devel
+- add explicit BRs on strigi-devel, zlib-devel, bzip2-devel, libpng-devel
+  in case we want to drop the Rs on these from kdelibs4-devel
+- consistently add all BRs as -devel Rs, not just almost all, until we can
+  figure out which, if any, are really needed
+- BR libsmbclient-devel instead of samba on F>=7, EL>=6
+
+* Fri Mar 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-4
+- restore minimum version requirement for cmake
+- build against libxklavier on EL5
+- don't set QT4DIR and PATH anymore, qdbuscpp2xml has been fixed
+
+* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.80.3-3
+- +eXecute perms for %%{_prefix}/lib/*
+
+* Fri Feb 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-2
+- rebuild for patched FindKDE4Internal.cmake
+
+* Wed Feb 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-1
+- update to 3.80.3
+- update and improve parallel-installability patch
+- drop obsolete joydevice.h patch
+- remove translations of "KDE" without the "4" from kde4.desktop
+- resync BR and -devel Requires
+- don't set LD_LIBRARY_PATH
+- set QT4DIR and PATH so CMake's direct $QT4DIR/qdbuscpp2xml calls work
+- fix missing underscore in _datadir
+- install kde4.desktop in install, not prep
+- fix invalid syntax in kde4.desktop
+
+* Wed Nov 29 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.3.20061003svn
+- dropped -DCMAKE_SKIP_RPATH=TRUE from cmake
+- compiling with QA_RPATHS=0x0003; export QA_RPATHS
+
+* Sun Nov 26 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.2.20061003svn
+- parallel build support
+- added -DCMAKE_SKIP_RPATH=TRUE to cmake to skip rpath
+- dropped qt4-devel >= 4.2.0, kdelibs4-devel as BR
+- spec file cleanups and added clean up in %%install
+- fixed PATH for libkdecore.so.5; cannot open shared object file;
+- added Logitech mouse support
+- added dbus-devel, hal-devel and more as BR
+- fixed broken joydevice.h - Kevin Kofler
+- added file kde4.desktop
+
+* Sun Oct 08 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.2-0.1.20061003svn
+- first Fedora RPM (parts borrowed from the OpenSUSE kdebase 4 RPM and the Fedora kdebase 3 RPM)
+- apply parallel-installability patch


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


--- env.sh DELETED ---


--- kde-legacy.pamd DELETED ---


--- kde-np-legacy.pamd DELETED ---


--- kde-np.pamd DELETED ---


--- kde.desktop DELETED ---


--- kde.pamd DELETED ---


--- kdebase-3.1-startpage.patch DELETED ---


--- kdebase-3.1.3-konsole-double-esc.patch DELETED ---


--- kdebase-3.2.0-keymap.patch DELETED ---


--- kdebase-3.2.92-logo.patch DELETED ---


--- kdebase-3.3.1-pam_krb5-bz#191049.patch DELETED ---


--- kdebase-3.3.92-kpersonalizer.patch DELETED ---


--- kdebase-3.3.92-vroot.patch DELETED ---


--- kdebase-3.4.2-kdesktop-konsole.patch DELETED ---


--- kdebase-3.5.1-kdm-readme.patch DELETED ---


--- kdebase-3.5.1-konsole-fonts.patch DELETED ---


--- kdebase-3.5.1-xdg.patch DELETED ---


--- kdebase-3.5.2-kconf_update-klipper.patch DELETED ---


--- kdebase-3.5.3-khelpcenter-sort.patch DELETED ---


--- kdebase-3.5.4-htdig.patch DELETED ---


--- kdebase-3.5.4-konqueror-shortcut.patch DELETED ---


--- kdebase-3.5.4-tango-icon-theme.patch DELETED ---


--- kdebase-3.5.5-dbus.patch DELETED ---


--- kdebase-3.5.5-keyinit.patch DELETED ---


--- kdebase-3.5.5-redhat-pam.patch DELETED ---


--- kdebase-3.5.5-suspend.patch DELETED ---


--- kdebase-3.5.6-kdm-alternatebackground.patch DELETED ---


--- kdebase-3.5.7-kde#83974.patch DELETED ---


--- kdebase-3.5.7-kio_media_mounthelper.patch DELETED ---


--- kdebase-3.5.7-konsolesu.patch DELETED ---


--- kdebase-3.5.8-consolekit-kdm.patch DELETED ---


--- kdebase-3.5.8-gdm-socket.patch DELETED ---


--- kdebase-3.5.8-konsole-bz#244906.patch DELETED ---


--- kdebase-3.5.8-redhat-startkde.patch DELETED ---


--- kdebase-3.x-shortcuts.patch DELETED ---


--- kderc DELETED ---


--- konsole.desktop DELETED ---


--- logrotate-kdm DELETED ---


--- mailsettings.cc DELETED ---


