From 371635a8d98964565613482ceae33db31be1479a Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 7 Jul 2014 15:05:04 +0200 Subject: [PATCH] drop gnome subpackages (#964977) --- openbox.spec | 65 +++++++++++----------------------------------------- 1 file changed, 13 insertions(+), 52 deletions(-) diff --git a/openbox.spec b/openbox.spec index f6e1a5e..d6dce93 100644 --- a/openbox.spec +++ b/openbox.spec @@ -33,6 +33,11 @@ BuildRequires: imlib2-devel BuildRequires: libpng-devel Provides: firstboot(windowmanager) +# gdm-control, gnome-control-center and openbox-gnome were removed in 3.5.2-5 +Obsoletes: gdm-control < 3.5.2-5 +Obsoletes: gnome-panel-control < 3.5.2-5 +Obsoletes: %{name}-gnome < 3.5.2-5 + %description Openbox is a window manager designed explicity for standards-compliance and speed. It is fast, lightweight, and heavily configurable (using XML for its @@ -69,45 +74,6 @@ Group: Development/Libraries The %{name}-libs package contains shared libraries used by %{name}. -%package gnome -Summary: GNOME integration for %{name} -Group: User Interface/Desktops -Requires: %{name} = %{version}-%{release} -Requires: gnome-session -Requires: gnome-panel-control -Requires: gdm-control -BuildArch: noarch - -%description gnome -The %{name}-gnome package contains the files needed for using %{name} inside a -GNOME session. - - -%package -n gnome-panel-control -Summary: Command line utility to control the GNOME panel -Group: User Interface/Desktops -Requires: %{name} = %{version}-%{release} -Requires: gnome-panel - -%description -n gnome-panel-control -gnome-panel-control can be used to invoke the GNOME panel run or main menu from -the command line. It is originally a helper utility of openbox since -gnome-panel is no longer managing its own key bindings. - - -%package -n gdm-control -Summary: Command line utility to control the GNOME Display Manager -Group: User Interface/Desktops -Requires: %{name} = %{version}-%{release} -Requires: gdm - -%description -n gdm-control -gdm-control can be used to control the GNOME Display Manager. It can invoke -its power management functions, shut down and reboot a machine or switch users. -It is originally a helper utility of openbox since gdm lacks control over these -features. - - %package kde Summary: KDE integration for %{name} Group: User Interface/Desktops @@ -150,6 +116,14 @@ install -m644 -D data/gnome-session/openbox-gnome.session \ install -m644 -D data/gnome-session/openbox-gnome-fallback.session \ %{buildroot}%{_datadir}/gnome-session/sessions/openbox-gnome-fallback.session +# remove unpackaged files +pushd %{buildroot} +rm ./%{_bindir}/{gdm-control,gnome-panel-control,%{name}-gnome-session} +rm ./%{_datadir}/xsessions/%{name}-gnome.desktop +rm ./%{_datadir}/gnome/wm-properties/openbox.desktop +rm ./%{_datadir}/gnome-session/sessions/openbox-gnome*.session +rm ./%{_mandir}/man1/%{name}-gnome-session*.1* +popd %find_lang %{name} @@ -186,19 +160,6 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{_libdir}/libobt.so %{_libdir}/pkgconfig/*.pc -%files gnome -%{_bindir}/%{name}-gnome-session -%{_datadir}/xsessions/%{name}-gnome.desktop -%{_datadir}/gnome/wm-properties/openbox.desktop -%{_datadir}/gnome-session/sessions/openbox-gnome*.session -%{_mandir}/man1/%{name}-gnome-session*.1* - -%files -n gnome-panel-control -%{_bindir}/gnome-panel-control - -%files -n gdm-control -%{_bindir}/gdm-control - %files kde %{_bindir}/%{name}-kde-session %{_datadir}/xsessions/%{name}-kde.desktop