[kde-workspace/f18] Revert previous commit
Martin Briza
mbriza at fedoraproject.org
Thu Dec 6 13:42:07 UTC 2012
commit 073fbbd6558f90478c8f334115c2ffb888cf44df
Author: Martin Briza <mbriza at redhat.com>
Date: Thu Dec 6 14:41:12 2012 +0100
Revert previous commit
Sorry, wanted to push this into rawhide, not f18
kde-workspace-4.9.3-systemd-displaymanager.patch | 479 ----------------------
kde-workspace.spec | 101 +++--
2 files changed, 60 insertions(+), 520 deletions(-)
---
diff --git a/kde-workspace.spec b/kde-workspace.spec
index 89bd2eb..fa8fa79 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -2,10 +2,16 @@
%define gpsd 1
%endif
+%if 0%{?fedora} > 16 || 0%{?rhel} > 6
+%define systemd 1
+%else
+%define consolekit 1
+%endif
+
Summary: KDE Workspace
Name: kde-workspace
-Version: 4.9.90
-Release: 2%{?dist}
+Version: 4.9.4
+Release: 1%{?dist}
License: GPLv2
URL: https://projects.kde.org/projects/kde/kde-workspace
@@ -15,14 +21,15 @@ URL: https://projects.kde.org/projects/kde/kde-workspace
%else
%global stable stable
%endif
-Source0: http://download.kde.org/%{stable}/%{version}/src/kde-workspace-%{version}.tar.xz
+Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/kde-workspace-%{version}.tar.xz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# RH/Fedora-specific startkde changes
-Patch1: kde-workspace-4.9.90-redhat_startkde.patch
+Patch1: kde-workspace-4.8.97-redhat_startkde.patch
# add konsole menuitem
# FIXME? only show menu when/if konsole is installed? then we can drop the hard-dep
-Patch2: kde-workspace-4.9.90-plasma_konsole.patch
+Patch2: kdebase-workspace-4.5.0-plasma-konsole.patch
Requires: konsole
# 441062: packagekit tools do not show icons correctly on KDE
@@ -34,6 +41,9 @@ Patch8: kdebase-workspace-4.2.85-klipper-url.patch
# 434824: KDE4 System Settings - No Method To Enter Administrative Mode
Patch9: kdebase-workspace-4.4.90-rootprivs.patch
+# drop useless kde font directories
+Patch11: kdebase-workspace-4.6.90-font.patch
+
# no klipper action on selection for Arora browser
Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
@@ -56,6 +66,9 @@ Patch20: kdebase-workspace-4.4.92-xsession_errors_O_APPEND.patch
# support the widgetStyle4 hack in the Qt KDE platform plugin
Patch21: kdebase-workspace-4.3.98-platformplugin-widgetstyle4.patch
+# drop hard dep on xorg-x11-apps (for xmessage), http://bugzilla.redhat.com/537609
+Patch23: kdebase-workspace-4.5.2-startkde_zenity.patch
+
# multilib QT_PLUGIN_PATH, http://bugzilla.redhat.com/704840
Patch24: kdebase-workspace-4.6.90-multilib_qt_plugin_path.patch
@@ -89,16 +102,16 @@ Patch52: kde-workspace-4.8.2-bz#732830-login.patch
# http://bugs.kde.org/242065
Patch53: kde-workspace-4.7.95-kdm_xauth.patch
-# fix CMakeLists.txt for renaming kscreenlocker.notifyrc to ksmserver.notifyrc
-Patch54: kde-workspace-4.9.90-kscreenlocker_rename.patch
-
# pam/systemd bogosity: kdm restart/shutdown does not work
# http://bugzilla.redhat.com/796969
Patch57: kde-workspace-4.8.0-bug796969.patch
-# merged patches: systemd-switch-user{,2} systemd-shutdown
-# Support for systemd AND ConsoleKit in kworkspace
-Patch62: kde-workspace-4.9.3-systemd-displaymanager.patch
+# initial systemd support
+Patch58: kde-workspace-4.8.0-systemd-shutdown.patch
+
+# Support for switching users with systemd - #859347
+Patch60: kde-workspace-4.9.2-systemd-switch-user.patch
+Patch61: kde-workspace-4.9.2-systemd-switch-user2.patch
## upstream patches
@@ -119,6 +132,9 @@ Patch300: kde-workspace-4.8.3-webkit.patch
Obsoletes: kdebase-workspace < 4.7.97-10
Provides: kdebase-workspace = %{version}-%{release}
+# kinfocenter moved kdebase-4.4 -> kdebase-workspace-4.5
+Conflicts: kdebase < 6:4.4.80
+
Requires: polkit-kde
%if ! 0%{?akonadi_subpkg}
@@ -144,7 +160,6 @@ BuildRequires: desktop-file-utils
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
BuildRequires: kactivities-devel >= %{version}
-BuildRequires: nepomuk-core-devel >= %{version}
BuildRequires: libjpeg-devel
BuildRequires: libutempter-devel
%ifnarch s390 s390x
@@ -159,7 +174,6 @@ BuildRequires: pkgconfig(libdmtx)
BuildRequires: pkgconfig(akonadi)
BuildRequires: pkgconfig(bluez)
BuildRequires: pkgconfig(dbusmenu-qt)
-BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glib-2.0)
%if 0%{?gpsd}
BuildRequires: pkgconfig(libgps)
@@ -176,12 +190,8 @@ BuildRequires: pkgconfig(NetworkManager) pkgconfig(libnm-glib)
BuildRequires: pkgconfig(polkit-qt-1)
BuildRequires: pkgconfig(python)
BuildRequires: pkgconfig(qimageblitz)
-BuildRequires: pkgconfig(QJson)
BuildRequires: pkgconfig(soprano)
BuildRequires: pkgconfig(xau)
-BuildRequires: pkgconfig(xcb)
-BuildRequires: pkgconfig(xcb-image)
-BuildRequires: pkgconfig(xcb-renderutil)
BuildRequires: pkgconfig(xdmcp)
BuildRequires: pkgconfig(xres)
# kwin
@@ -218,6 +228,12 @@ Requires: dbus-x11
#Requires: xorg-x11-apps
Requires: xorg-x11-utils
Requires: xorg-x11-server-utils
+%if 0%{?consolekit}
+BuildRequires: pkgconfig(ck-connector)
+# for shutdown/restart support without KDM (and KDM requires this anyway)
+# (works around #788171)
+Requires: ConsoleKit
+%endif
%define default_face_icon default1.png
Requires: kde-settings-ksplash
@@ -289,6 +305,10 @@ Provides: service(graphical-login) = kdm
Requires: kgreeter-plugins = %{version}-%{release}
Requires: libkworkspace%{?_isa} = %{version}-%{release}
Requires: kde-settings-kdm
+%if 0%{?consolekit}
+# prevent "Cannot open ConsoleKit session" when logging in (#787855)
+Requires: ConsoleKit-x11
+%endif
%description -n kdm
KDM provides the graphical login screen, shown shortly after boot up,
log out, and when user switching.
@@ -402,17 +422,18 @@ Requires: akonadi
%patch1 -p1 -b .redhat_startkde
# Well, I looked at doing this using the context menu plugin system and it
# looked like a lot more work than this simple patch to me. -- Kevin
-# FIXME/REBASE -- rex
%patch2 -p1 -b .plasma-konsole
%patch7 -p1 -b .krdb
%patch8 -p1 -b .klipper-url
%patch9 -p1 -b .rootprivs
+%patch11 -p1 -b .font
%patch15 -p1 -b .kio_sysinfo
%patch16 -p1 -b .showremainingtime
%patch17 -p1 -b .classicmenu-logout
%patch19 -p1 -b .kdm_plymouth
%patch20 -p1 -b .xsession_errors_O_APPEND
%patch21 -p1 -b .platformplugin-widgetstyle4
+%patch23 -p1 -b .startkde_zenity
%patch24 -p1 -b .multilib_qt_plugin_path
%patch25 -p1 -b .bz#747982-launchers
%patch26 -p1 -b .systray_ktp_presence
@@ -423,9 +444,10 @@ Requires: akonadi
%patch51 -p1 -b .add_apper_to_kickoff_favorites
%patch52 -p1 -b .bz#732830-login
%patch53 -p1 -b .kdm_xauth
-%patch54 -p1 -b .kscreenlocker_rename
%patch57 -p1 -b .bug796969
-%patch62 -p0 -b .systemd-displaymanager
+%patch58 -p1 -b .systemd-shutdown
+%patch60 -p1 -b .systemd-switch-user
+%patch61 -p0 -b .systemd-switch-user2
# upstream patches
@@ -451,7 +473,8 @@ pushd %{_target_platform}
-DKDE4_KDM_PAM_SERVICE=kdm \
-DKDE4_KCHECKPASS_PAM_SERVICE=kcheckpass \
-DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver \
- -DPOWERDEVIL_USE_SYSTEMD:BOOL=ON \
+ %{?systemd:-DKWORKSPACE_USE_SYSTEMD:BOOL=ON} \
+ %{?systemd:-DPOWERDEVIL_USE_SYSTEMD:BOOL=ON} \
..
popd
@@ -545,6 +568,10 @@ fi
%{_kde4_bindir}/plasma-netbook
%{_kde4_bindir}/plasma-overlay
%{_kde4_bindir}/plasma-windowed
+%{_kde4_bindir}/plasmaengineexplorer
+%{_kde4_bindir}/plasmoidviewer
+%{_kde4_bindir}/plasmawallpaperviewer
+%{_kde4_bindir}/remote-widgets-browser
%{_kde4_bindir}/solid-action-desktop-gen
%{_kde4_bindir}/solid-network
%{_kde4_bindir}/startkde
@@ -557,7 +584,6 @@ fi
%{_kde4_appsdir}/kcmkeyboard/
%{_kde4_appsdir}/kcmkeys/
%{_kde4_appsdir}/kcmsolidactions/
-%{_kde4_appsdir}/kcmstyle/
%{_kde4_appsdir}/kcmusb/
%ifnarch s390 s390x
%{_kde4_appsdir}/kcmview1394/
@@ -568,9 +594,8 @@ fi
%{_kde4_appsdir}/khotkeys/
%{_kde4_appsdir}/kinfocenter/
%{_kde4_appsdir}/kmenuedit/
+%{_kde4_appsdir}/kscreenlocker/
%dir %{_kde4_appsdir}/ksmserver/
-%{_kde4_appsdir}/ksmserver/ksmserver.notifyrc
-%{_kde4_appsdir}/ksmserver/screenlocker/
%dir %{_kde4_appsdir}/ksmserver/themes/
%{_kde4_appsdir}/ksmserver/themes/contour/
%{_kde4_appsdir}/ksmserver/themes/default/
@@ -596,13 +621,12 @@ fi
%{_kde4_configdir}/aurorae.knsrc
%{_kde4_configdir}/background.knsrc
%{_kde4_configdir}/ksplash.knsrc
-%{_kde4_configdir}/kwineffect.knsrc
-%{_kde4_configdir}/kwinscripts.knsrc
-%{_kde4_configdir}/kwinswitcher.knsrc
%{_kde4_configdir}/plasma-overlayrc
%{_kde4_configdir}/plasma-themes.knsrc
%{_kde4_configdir}/wallpaper.knsrc
%{_kde4_configdir}/xcursor.knsrc
+%{_kde4_configdir}/kwinscripts.knsrc
+%{_kde4_configdir}/kwinswitcher.knsrc
%{_kde4_datadir}/kde4/services/*
%exclude %{_kde4_datadir}/kde4/services/kdm.desktop
@@ -617,12 +641,12 @@ fi
%{_sysconfdir}/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
%{_sysconfdir}/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf
%{_sysconfdir}/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf
-%{_datadir}/dbus-1/interfaces/com.canonical.AppMenu.Registrar.xml
-%{_datadir}/dbus-1/interfaces/org.kde.kded.appmenu.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.ScreenSaver.xml
%{_datadir}/dbus-1/interfaces/org.kde.KSMServerInterface.xml
%{_datadir}/dbus-1/interfaces/org.kde.KWin.xml
%{_datadir}/dbus-1/interfaces/org.kde.khotkeys.xml
%{_datadir}/dbus-1/interfaces/org.kde.krunner.App.xml
+%{_datadir}/dbus-1/interfaces/org.kde.screensaver.xml
%{_datadir}/dbus-1/services/org.kde.fontinst.service
%{_datadir}/dbus-1/services/org.kde.krunner.service
%{_datadir}/dbus-1/system-services/org.kde.fontinst.service
@@ -644,7 +668,6 @@ fi
%{_kde4_libdir}/kde4/classic_mode.so
%{_kde4_libdir}/kde4/devinfo.so
%{_kde4_libdir}/kde4/icon_mode.so
-%{_kde4_libdir}/kde4/imports/org/kde/kwin/
%{_kde4_libdir}/kde4/ion_*.so
%{_kde4_libdir}/kde4/kcm_*.so
%exclude %{_kde4_libdir}/kde4/kcm_colors.so
@@ -657,9 +680,11 @@ fi
%{_kde4_libdir}/kde4/kwin3_b2.so
%{_kde4_libdir}/kde4/kwin3_laptop.so
%{_kde4_libdir}/kde4/kwin3_oxygen.so
+%{_kde4_libdir}/kde4/kwin3_plastik.so
%{_kde4_libdir}/kde4/kwin4_effect_builtins.so
%{_kde4_libdir}/kde4/kwin_b2_config.so
%{_kde4_libdir}/kde4/kwin_oxygen_config.so
+%{_kde4_libdir}/kde4/kwin_plastik_config.so
%{_kde4_libdir}/kde4/plasma_animator_default.so
%{_kde4_libdir}/kde4/plasma_applet_*.so
%{_kde4_libdir}/kde4/plasma_containmentactions_*.so
@@ -684,7 +709,7 @@ fi
%{_kde4_libexecdir}/kcmdatetimehelper
%{_kde4_libexecdir}/kcmkdmhelper
%{_kde4_libexecdir}/krootimage
-%{_kde4_libexecdir}/kscreenlocker_greet
+%{_kde4_libexecdir}/kscreenlocker
%{_kde4_libexecdir}/kwin_killer_helper
%{_kde4_libexecdir}/kwin_opengl_test
%{_kde4_libexecdir}/kwin_rules_dialog
@@ -705,6 +730,7 @@ fi
%{_kde4_libdir}/libpowerdevilconfigcommonprivate.so
%{_kde4_libdir}/libsystemsettingsview.so
%{_kde4_libdir}/kconf_update_bin/*
+%{_mandir}/man1/plasm*.1*
%if 0%{?googlegadgets}
# googlegadgets
%exclude %{_kde4_libdir}/kde4/plasma_package_ggl.so
@@ -973,13 +999,6 @@ fi
%changelog
-* Thu Dec 06 2012 Martin Briza <mbriza at redhat.com> 4.9.90-2
-- Merged and cleaned the systemd shutdown and logout patches.
-- It is possible to use systemd and/or CK without defining it at compile time
-
-* Mon Dec 03 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.90-1
-- 4.9.90 (4.10 beta2)
-
* Mon Dec 03 2012 Than Ngo <than at redhat.com> - 4.9.4-1
- 4.9.4
@@ -1592,7 +1611,7 @@ fi
* Tue Jul 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.95-1.py27
- rebuild for python27
-* Sun Jul 25 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.95-1
+* Sat Jul 25 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.95-1
- 4.5 RC3 (4.4.95)
* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 4.4.92-3
@@ -1742,7 +1761,7 @@ fi
- do not link calendar dataengine with Akonadi (kde#215150, rh#552473)
- s/plasma-engine/plasma-dataengine/
-* Sat Jan 09 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-4
+* Fri Jan 09 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-4
- krunner crasher (kde#221871)
* Fri Jan 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-3
@@ -2563,7 +2582,7 @@ fi
- BR: libXtst-devel
- BR: libXScrnSaver-devel
-* Fri Nov 16 2007 Sebastian Vahl <fedora at deadbabylon.de> 3.96.0-3
+* Fri Nov 15 2007 Sebastian Vahl <fedora at deadbabylon.de> 3.96.0-3
- own some more directories
- add %%defattr to package devel
- some spec cleanups
More information about the scm-commits
mailing list