rpms/kdebase-workspace/devel kdebase-workspace.spec,1.203,1.204

Mon Mar 16 20:25:24 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12300

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Mon Mar 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-9
- kdm subpkg
- -devel: move cmake modules here
- Requires: kdelibs4%{?_isa} ..
- BR: libutempter-devel (drops need for kwrited helper)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204

--- kdebase-workspace.spec	12 Mar 2009 17:04:46 -0000	1.203
+++ kdebase-workspace.spec	16 Mar 2009 20:24:53 -0000	1.204
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.1
 
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -49,10 +49,6 @@
 # 4.2, http://bugs.kde.org/185585
 Patch106: kdebase-workspace-4.2.1-kde#185585.patch
 
-Provides: kdebase-kdm = 6:%{version}-%{release}
-Provides: kdm = %{version}-%{release}
-Provides: service(graphical-login) = kdm
-
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
 # upgrade path: kdebase(3) -> kdebase-workspace
@@ -77,6 +73,7 @@
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libcaptury-devel
 BuildRequires: libraw1394-devel
+BuildRequires: libutempter-devel
 BuildRequires: libxklavier-devel
 BuildRequires: libXres-devel
 BuildRequires: lm_sensors-devel
@@ -90,7 +87,6 @@
 # BuildRequires: libusb-devel
 
 Requires: %{name}-libs = %{version}-%{release}
-Requires: kde-settings-kdm
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
@@ -100,7 +96,8 @@
 Requires: kdebase-runtime >= %{version}
 Requires: oxygen-icon-theme >= %{version}
 
-# split ksysguardd
+# pkg-splits, upgrade path
+Requires: kdm = %{version}-%{release}
 Requires: ksysguardd = %{version}-%{release}
 
 # startkde references: dbus-launch df mkdir test xmessage xprop xrandr xrdb xset xsetroot
@@ -124,7 +121,6 @@
 KDE Desktop Environment.
 
 This package contains:
-* kdm (the login manager of KDE)
 * khotkeys (a hotkey daemon)
 * klipper (a cut & paste history utility)
 * kmenuedit (the menu editor)
@@ -157,7 +153,7 @@
 %else
 Provides: solid-bluetooth = 4.3-0.1
 %endif
-Requires: kdelibs4 >= %{version}
+Requires: kdelibs4%{?_isa} >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
@@ -172,6 +168,17 @@
 %description wallpapers
 %{summary}.
 
+%package -n kdm
+Summary: The KDE login manager
+group: User Interface/X
+Provides: kdebase-kdm = %{version}-%{release}
+Provides: service(graphical-login) = kdm
+Requires: kdelibs4%{?_isa} >= %{version}
+Requires: kde-settings-kdm
+%description -n kdm
+KDM provides the graphical login screen, shown shortly after boot up,
+log out, and when user switching.
+
 %package -n ksysguardd
 Summary: Performance monitor daemon
 Group:   System Environment/Daemons
@@ -202,6 +209,7 @@
 %description python-applet
 %{summary}.
 
+
 %prep
 
 %setup -q
@@ -238,6 +246,7 @@
 %patch105 -p0 -b .desktopnumbers
 %patch106 -p0 -b .kde#185585
 
+
 %build
 
 mkdir -p %{_target_platform}
@@ -245,7 +254,8 @@
 %{cmake_kde4} \
   -DKDE4_KDM_PAM_SERVICE=kdm \
   -DKDE4_KCHECKPASS_PAM_SERVICE=kcheckpass \
-  -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver ..
+  -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver \
+  ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -295,37 +305,135 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %config(noreplace) %{_kde4_sysconfdir}/systemsettingsrc
-%{_kde4_bindir}/*
-%exclude %{_kde4_bindir}/ksysguardd
-%{_kde4_appsdir}/*
-%{_kde4_configdir}/*
+%{_kde4_bindir}/kaccess                           
+%{_kde4_bindir}/kapplymousetheme                  
+%{_kde4_bindir}/kblankscrn.kss                    
+%{_kde4_bindir}/kcheckrunning                     
+%{_kde4_bindir}/kcminit                           
+%{_kde4_bindir}/kcminit_startup                   
+%{_kde4_bindir}/kdostartupconfig4                 
+%{_kde4_bindir}/kfontinst
+%{_kde4_bindir}/kfontview
+%{_kde4_bindir}/klipper
+%{_kde4_bindir}/kmenuedit
+%{_kde4_bindir}/krandom.kss
+%{_kde4_bindir}/krandrtray
+%{_kde4_bindir}/krdb
+%{_kde4_bindir}/krunner
+%{_kde4_bindir}/ksmserver
+%{_kde4_bindir}/ksplashsimple
+%{_kde4_bindir}/ksplashx
+%{_kde4_bindir}/ksplashx_scale
+%{_kde4_bindir}/kstartupconfig4
+%{_kde4_bindir}/ksysguard
+%{_kde4_bindir}/ksystraycmd
+%{_kde4_bindir}/kwin*
+%{_kde4_bindir}/kxkb
+%{_kde4_bindir}/plasma
+%{_kde4_bindir}/plasma-overlay
+%{_kde4_bindir}/plasmaengineexplorer
+%{_kde4_bindir}/plasmapkg
+%{_kde4_bindir}/plasmoidviewer
+%{_kde4_bindir}/safestartkde
+%{_kde4_bindir}/setscheduler
+%{_kde4_bindir}/solid-bluetooth
+%{_kde4_bindir}/solid-network
+%{_kde4_bindir}/solid-powermanagement
+%{_kde4_bindir}/startkde
+%{_kde4_bindir}/systemsettings
+
+%{_kde4_appsdir}/color-schemes/
+%{_kde4_appsdir}/desktoptheme/
+%{_kde4_appsdir}/kaccess/
+%{_kde4_appsdir}/kcminput/
+%{_kde4_appsdir}/kcmkeys/
+%{_kde4_appsdir}/kconf_update/
+%{_kde4_appsdir}/kcontrol/
+%{_kde4_appsdir}/kdisplay/
+%{_kde4_appsdir}/kfontinst/
+%{_kde4_appsdir}/kfontview/
+%{_kde4_appsdir}/khotkeys/
+%{_kde4_appsdir}/kmenuedit/
+%{_kde4_appsdir}/konqsidebartng/
+%{_kde4_appsdir}/ksplash/
+%{_kde4_appsdir}/ksysguard/
+%{_kde4_appsdir}/kthememanager/
+%{_kde4_appsdir}/kwin/
+%{_kde4_appsdir}/kwrited/
+%{_kde4_appsdir}/plasma/
+%{_kde4_appsdir}/plasma_scriptengine_ruby/
+%{_kde4_appsdir}/powerdevil/
+%{_kde4_appsdir}/solid/
+%{_kde4_appsdir}/solidfakenetbackend/
+%{_kde4_appsdir}/systemsettings/
+
+%{_kde4_configdir}/background.knsrc
+%{_kde4_configdir}/colorschemes.knsrc
+%{_kde4_configdir}/klipperrc
+%{_kde4_configdir}/ksplash.knsrc
+%{_kde4_configdir}/ksysguard.knsrc
+%{_kde4_configdir}/plasma-overlayrc
+%{_kde4_configdir}/plasma-themes.knsrc
+%{_kde4_configdir}/wallpaper.knsrc
+
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
-%{_kde4_datadir}/sounds/*
-%{_kde4_datadir}/autostart/*
+%{_kde4_datadir}/sounds/pop.wav
+%{_kde4_datadir}/autostart/klipper.desktop
+%{_kde4_datadir}/autostart/krunner.desktop
+%{_kde4_datadir}/autostart/plasma.desktop
 %{_kde4_datadir}/applications/kde4/*
-%{_datadir}/dbus-1/interfaces/*
-%{_datadir}/dbus-1/services/*
+%{_datadir}/dbus-1/interfaces/*.xml
+%{_datadir}/dbus-1/services/*.service
 %{_kde4_datadir}/config.kcfg/*
-%{_datadir}/xsessions/*
-%{_kde4_docdir}/HTML/en/*
+%{_datadir}/xsessions/*.desktop
+%{_kde4_docdir}/HTML/en/kcontrol/
+%{_kde4_docdir}/HTML/en/klipper/
+%{_kde4_docdir}/HTML/en/kmenuedit/
+%{_kde4_docdir}/HTML/en/ksysguard/
+%{_kde4_docdir}/HTML/en/kxkb/
+%{_kde4_docdir}/HTML/en/plasma/
+%{_kde4_docdir}/HTML/en/systemsettings/
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_libdir}/kde4/*.so
+%{_kde4_libdir}/kde4/fontthumbnail.so
+%{_kde4_libdir}/kde4/ion_*.so
+%{_kde4_libdir}/kde4/kcm_*.so
+%{_kde4_libdir}/kde4/kded_*.so
+%{_kde4_libdir}/kde4/kfontviewpart.so
+%{_kde4_libdir}/kde4/kio_fonts.so
+%{_kde4_libdir}/kde4/krunner_*.so
+%{_kde4_libdir}/kde4/kstyle_keramik_config.so
+%{_kde4_libdir}/kde4/kwin*_*.so
+%{_kde4_libdir}/kde4/plasma_animator_default.so
+%{_kde4_libdir}/kde4/plasma_applet_*.so
+%{_kde4_libdir}/kde4/plasma_appletscript_*.so
+%{_kde4_libdir}/kde4/plasma_appletscriptengine_*.so
+%{_kde4_libdir}/kde4/plasma_containment_*.so
+%{_kde4_libdir}/kde4/plasma_engine_*.so
+%{_kde4_libdir}/kde4/plasma_package*_*.so
+%{_kde4_libdir}/kde4/plasma_runnerscript_*.so
+%{_kde4_libdir}/kde4/plasma_wallpaper_*.so
+%{_kde4_libdir}/kde4/solid_*.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
-%{_kde4_libexecdir}/*
+%{_kde4_libexecdir}/kcheckpass
+%{_kde4_libexecdir}/kcmdatetimehelper
+%{_kde4_libexecdir}/kfontprint
+%{_kde4_libexecdir}/kio_fonts_helper
+%{_kde4_libexecdir}/krootimage
+%{_kde4_libexecdir}/krunner_lock
+%{_kde4_libexecdir}/test_kcm_xinerama
 %{_libdir}/strigi/
 %{_kde4_libdir}/libkdeinit*.so
 %{_kde4_libdir}/kconf_update_bin/*
 # googlegadgets
 %exclude %{_kde4_libdir}/kde4/plasma_package_ggl.so
 %exclude %{_kde4_libdir}/kde4/plasma_scriptengine_ggl.so
-%exclude %{_kde4_datadir}/kde4/apps/plasma/plasmoids/ggl_*
+%exclude %{_kde4_appsdir}/plasma/plasmoids/ggl_*
 %exclude %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
 %exclude %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
 # python widget
-%exclude %{_kde4_appsdir}/plasma_scriptengine_python
 %exclude %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
 
 %files libs
@@ -337,9 +445,9 @@
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
-# CMake seems to change behaviour between F11's cmake (2.6.3rc5)
-# and F10's cmake (2.6.2) -- Lorenzo
-%if 0%{?fedora} > 10
+%{_kde4_appsdir}/cmake/modules/*.cmake
+# CMake changes behaviour after cmake-2.6.2 
+%if "%{?_cmake_version}" > "2.6.2" 
 %{_kde4_libdir}/cmake/KDE4Workspace*
 %else
 %{_kde4_libdir}/KDE4Workspace*
@@ -351,6 +459,22 @@
 %defattr(-,root,root,-)
 %{_kde4_datadir}/wallpapers/*
 
+%files -n kdm
+%defattr(-,root,root,-)
+%{_kde4_bindir}/genkdmconf
+%{_kde4_bindir}/kdm
+%{_kde4_bindir}/kdmctl
+%{_kde4_libdir}/kde4/kcm_kdm.so
+%{_kde4_libexecdir}/kdm_config
+%{_kde4_libexecdir}/kdm_greet
+%{_kde4_libdir}/kde4/kgreet_*.so
+%{_kde4_configdir}/kdm.knsrc
+%{_kde4_docdir}/HTML/en/kdm/
+%dir %{_kde4_appsdir}/doc
+%{_kde4_appsdir}/doc/kdm/
+%{_kde4_appsdir}/kdm/
+%{_kde4_datadir}/kde4/services/kdm.desktop
+
 %files -n ksysguardd
 %defattr(-,root,root,-)
 %config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc
@@ -385,6 +509,12 @@
 
 
 %changelog
+* Mon Mar 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-9
+- kdm subpkg
+- -devel: move cmake modules here
+- Requires: kdelibs4%%{?_isa} ..
+- BR: libutempter-devel (drops need for kwrited helper)
+
 * Thu Mar 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-8
 - oxygen-cursor-themes: make noarch (f10+)
 


