[kde-workspace] kgreeter-plugins subpkg (#785817)
Rex Dieter
rdieter at fedoraproject.org
Tue Jan 31 13:48:51 UTC 2012
commit 5392152714051fc0729876e73ea38c0408f606fe
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Tue Jan 31 07:48:40 2012 -0600
kgreeter-plugins subpkg (#785817)
kde-workspace.spec | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/kde-workspace.spec b/kde-workspace.spec
index a6ae028..d2fd4fb 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -6,7 +6,7 @@
Summary: KDE Workspace
Name: kde-workspace
Version: 4.8.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
URL: https://projects.kde.org/projects/kde/kde-workspace
@@ -104,8 +104,6 @@ Provides: kdebase-workspace = %{version}-%{release}
# kinfocenter moved kdebase-4.4 -> kdebase-workspace-4.5
Conflicts: kdebase < 6:4.4.80
-# kgreet_* plugins moved here
-Conflicts: kdm < 4.6.90-4
Requires: polkit-kde
@@ -180,6 +178,8 @@ Requires: kde-runtime >= %{version}
# for kcm_keyboard
Requires: iso-codes
Requires: kio_sysinfo
+# for kscreenlocker
+Requires: kgreeter-plugins = %{version}-%{release}
%if 0%{?fedora} < 17
# upgrade path
Requires: ksysguard = %{version}-%{release}
@@ -258,6 +258,7 @@ The Color Selection module is comprised of several sections:
Summary: The KDE login manager
Provides: kdebase-kdm = %{version}-%{release}
Provides: service(graphical-login) = kdm
+Requires: kgreeter-plugins = %{version}-%{release}
Requires: libkworkspace%{?_isa} = %{version}-%{release}
Requires: kde-settings-kdm
%description -n kdm
@@ -277,12 +278,20 @@ BuildArch: noarch
A collection of kdm themes, including: circles, horos, oxygen, oxygen-air,
as well as stripes wallpaper.
+%package -n kgreeter-plugins
+Summary: KDE Greeter Plugin Components
+# kgreet_* plugins moved
+Conflicts: kdm < 4.6.90-4
+Conflicts: kde-workspace < 4.7.80-3
+%description -n kgreeter-plugins
+%{summary} that are needed by KDM and Screensaver unlocking.
+
%package -n ksysguard
Summary: KDE System Monitor
Requires: ksysguardd = %{version}-%{release}
Requires: ksysguard-libs%{?_isa} = %{version}-%{release}
%description -n ksysguard
-%{summary}
+%{summary}.
%package -n ksysguard-libs
Summary: Runtime libraries for ksysguard
@@ -599,7 +608,6 @@ fi
%exclude %{_kde4_libdir}/kde4/kcm_kdm.so
%{_kde4_libdir}/kde4/kded_*.so
%{_kde4_libdir}/kde4/keyboard_layout_widget.so
-%{_kde4_libdir}/kde4/kgreet_*.so
%{_kde4_libdir}/kde4/krunner_*.so
%{_kde4_libdir}/kde4/kstyle_oxygen_config.so
%{_kde4_libdir}/kde4/kwin3_aurorae.so
@@ -817,6 +825,11 @@ fi
# not sure why this is included in kdm sources... ? -- rex
%{_kde4_datadir}/wallpapers/stripes.png*
+%files -n kgreeter-plugins
+%{_kde4_libdir}/kde4/kgreet_classic.so
+%{_kde4_libdir}/kde4/kgreet_generic.so
+%{_kde4_libdir}/kde4/kgreet_winbind.so
+
%post -n ksysguard
touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
@@ -922,6 +935,9 @@ fi
%changelog
+* Tue Jan 31 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8.0-3
+- kgreeter-plugins subpkg (#785817)
+
* Tue Jan 24 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8.0-2
- kcm_colors subpkg (#761184)
- kdm-themes: Requires: kde-wallpapers unconditionally (#784389)
More information about the scm-commits
mailing list