- rel 4; branch diff update

[packages/kde4-kdebase-workspace.git] / kde4-kdebase-workspace.spec

diff --git a/kde4-kdebase-workspace.spec b/kde4-kdebase-workspace.spec
index a4137c9e2e2c0ddb221d366ca2951190c2435b57..abc8e23563d616a3396e5b5afb12428d0e909980 100644 (file)
--- a/kde4-kdebase-workspace.spec
+++ b/kde4-kdebase-workspace.spec
@@ -1,18 +1,18 @@
 # TODO:
 %define                oname           kdebase-workspace
 %define                _state          stable
-%define                qt4brver        4.4.3
+%define                qt4brver        4.5.0
 # - internal deps (really FUBAR currently)
 
 Summary:       KDE 4 base workspace components
 Summary(pl.UTF-8):     Podstawowe komponenty środowiska KDE 4
 Name:          kde4-kdebase-workspace
-Version:       4.2.0
-Release:       7
+Version:       4.2.3
+Release:       4
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{oname}-%{version}.tar.bz2
-# Source0-md5: 193e30b9ed0b55b0196289d9df43a904
+# Source0-md5: f58d388883d73c69a0a719819625b171
 Source1:       kdebase-kdesktop.pam
 Source2:       kdebase-kdm.pam
 Source3:       kdebase-kdm-np.pam
@@ -23,10 +23,12 @@ Source7:    kdebase-kdm_pldwallpaper.png
 Source8:       kdebase-kde.pam
 Source9:       %{name}-kcheckpass.pam
 Source10:      %{name}-kscreensaver.pam
+Source11:      kdebase-kdm.Xsession
 Source15:      %{name}.desktop
 Source16:      %{name}-session
 Patch0:                %{name}-rootprivs.patch
 Patch1:                %{name}-solid-bluetooth.patch
+Patch2:                %{name}-kdmconfig.patch
 Patch100:      %{name}-branch.diff
 URL:           http://www.kde.org/
 BuildRequires: ConsoleKit-devel
@@ -43,7 +45,8 @@ BuildRequires:        QtWebKit-devel >= %{qt4brver}
 BuildRequires: automoc4 >= 0.9.88
 BuildRequires: bluez-libs-devel
 BuildRequires: boost-devel
-BuildRequires: cmake >= 2.6.2
+BuildRequires: cmake >= 2.6.3
+BuildRequires: google-gadgets-qt >= 0.10.5
 BuildRequires: kde4-kdelibs-devel >= %{version}
 BuildRequires: kde4-kdepimlibs-devel >= %{version}
 BuildRequires: libcaptury-devel
@@ -52,13 +55,15 @@ BuildRequires:      libtirpc-devel
 BuildRequires: libusb-devel
 BuildRequires: libxklavier-devel
 BuildRequires: lm_sensors-devel
-BuildRequires: phonon-devel >= 4.3.0
+BuildRequires: phonon-devel >= 4.3.1
 BuildRequires: python-sip-devel
 BuildRequires: qedje-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: qt4-build >= %{qt4brver}
 BuildRequires: qzion-devel
 BuildRequires: rpm-pythonprov
+BuildRequires: soprano-devel
+BuildRequires: strigi-devel
 BuildRequires: xmms-devel
 BuildRequires: xorg-lib-libXft-devel
 BuildRequires: xorg-lib-libXtst-devel
@@ -509,6 +514,7 @@ Motyw ikon do KDE - oxygen. Ten pakiet zawiera ikony SVG.
 %patch100 -p1
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 
 %build
 install -d build
@@ -534,7 +540,7 @@ rm -rf $RPM_BUILD_ROOT
        kde_htmldir=%{_kdedocdir}
 
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
-install -d $RPM_BUILD_ROOT/etc/{X11,pam.d,security}
+install -d $RPM_BUILD_ROOT/etc/{X11/kdm,pam.d,security}
 install -d $RPM_BUILD_ROOT%{_datadir}/config/kdm \
        $RPM_BUILD_ROOT%{_datadir}/apps/konqueror \
        $RPM_BUILD_ROOT%{_datadir}/apps/kcontrol \
@@ -552,11 +558,13 @@ install %{SOURCE10}       $RPM_BUILD_ROOT/etc/pam.d/kscreensaver
 install %{SOURCE4}     $RPM_BUILD_ROOT/etc/rc.d/init.d/kdm
 install %{SOURCE5}     $RPM_BUILD_ROOT/etc/sysconfig/kdm
 
+install %{SOURCE11}    $RPM_BUILD_ROOT/etc/X11/kdm/Xsession
+
 install %{SOURCE6}     $RPM_BUILD_ROOT%{_datadir}/apps/kdm/pics/pldlogo.png
 install %{SOURCE7}     $RPM_BUILD_ROOT%{_datadir}/wallpapers/kdm_pld.png
 
 install %{SOURCE16} $RPM_BUILD_ROOT%{_bindir}/kde4-session
-install %{SOURCE15} $RPM_BUILD_ROOT%{_datadir}/apps/kdm/sessions/kde4.desktop
+install %{SOURCE15} $RPM_BUILD_ROOT/etc/X11/sessions/kde4.desktop
 
 $RPM_BUILD_ROOT%{_bindir}/genkdmconf --in $RPM_BUILD_ROOT%{_datadir}/config/kdm
 rm -f $RPM_BUILD_ROOT%{_datadir}/config/kdm/README
@@ -865,6 +873,7 @@ fi
 %attr(755,root,root) %{_libdir}/kde4/kcm_keyboard.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_keyboard_layout.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_keys.so
+%{_datadir}/kde4/services/kcm_keyboard.desktop
 %{_datadir}/apps/kcminput/cursor_large_black.pcf.gz
 %{_datadir}/apps/kcminput/cursor_large_white.pcf.gz
 %{_datadir}/apps/kcminput/cursor_small_white.pcf.gz
@@ -956,7 +965,7 @@ fi
 %attr(755,root,root) %{_libdir}/libtaskmanager.so
 %attr(755,root,root) %{_libdir}/libweather_ion.so
 %attr(755,root,root) %{_libdir}/liblsofui.so
-%{_libdir}/KDE4Workspace-4.2.0
+%{_libdir}/cmake/KDE4Workspace-%{version}
 %{_includedir}/KDE/Plasma/Weather
 %{_includedir}/plasma/weather
 %{_includedir}/*.h
@@ -1403,15 +1412,15 @@ fi
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/kde
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.kdm
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/kdm
-%dir %{_datadir}/config/kdm
-%config(noreplace) %verify(not md5 mtime size) %{_datadir}/config/kdm/kdmrc
-%config(noreplace) %verify(not md5 mtime size) %{_datadir}/config/kdm/backgroundrc
-%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_datadir}/config/kdm/Xreset
-%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_datadir}/config/kdm/Xsession
-%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_datadir}/config/kdm/Xsetup
-%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_datadir}/config/kdm/Xstartup
-%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_datadir}/config/kdm/Xwilling
-%config(noreplace) %verify(not md5 mtime size) %{_datadir}/config/kdm/Xaccess
+%dir /etc/X11/kdm
+%config(noreplace) %verify(not md5 mtime size) /etc/X11/kdm/kdmrc
+%config(noreplace) %verify(not md5 mtime size) /etc/X11/kdm/backgroundrc
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/X11/kdm/Xreset
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/X11/kdm/Xsession
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/X11/kdm/Xsetup
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/X11/kdm/Xstartup
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/X11/kdm/Xwilling
+%config(noreplace) %verify(not md5 mtime size) /etc/X11/kdm/Xaccess
 %attr(754,root,root) /etc/rc.d/init.d/kdm
 %attr(755,root,root) %{_bindir}/genkdmconf
 %attr(755,root,root) %{_bindir}/kdm
@@ -1419,6 +1428,7 @@ fi
 %attr(755,root,root) %{_libdir}/kde4/kcm_kdm.so
 %attr(755,root,root) %{_libdir}/kde4/libexec/kdm_config
 %attr(755,root,root) %{_libdir}/kde4/libexec/kdm_greet
+/etc/X11/sessions
 # XXX move dir below elsewhere
 %dir %{_datadir}/apps/doc
 %{_datadir}/apps/doc/kdm