From a8f400a94b5575d6c85c4f9cfd5ebda8670c889ddf25b4af02762655f7e06d85 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 27 May 2010 22:29:17 +0000 Subject: [PATCH 1/3] Accepting request 40588 from home:gberh:gdm Copy from home:gberh:gdm/gdm via accept of submit request 40588 revision 4. Request was accepted with message: thanks OBS-URL: https://build.opensuse.org/request/show/40588 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=125 --- gdm.changes | 15 +++++++++++++++ gdm.spec | 20 +++++++++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/gdm.changes b/gdm.changes index 7a0422f..8c0d8e8 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon May 24 15:55:31 UTC 2010 - guido+opensuse.org@berhoerster.name + +- Fixed filelist + +------------------------------------------------------------------- +Mon May 24 10:41:51 UTC 2010 - guido+opensuse.org@berhoerster.name + +- Split off gnome-applets-gdm + +------------------------------------------------------------------- +Sun May 23 09:25:25 UTC 2010 - guido+opensuse.org@berhoerster.name + +- Depend on gnome-session-core rather than gnome-session + ------------------------------------------------------------------- Fri May 7 00:03:41 CEST 2010 - captain.magnus@opensuse.org diff --git a/gdm.spec b/gdm.spec index 75394a3..8c814a9 100644 --- a/gdm.spec +++ b/gdm.spec @@ -96,7 +96,7 @@ Obsoletes: fast-user-switch-applet <= 2.22.0 Requires: %{name}-branding Requires: %{name}-lang = %{version} Requires: ConsoleKit-x11 -Requires: gnome-session +Requires: gnome-session-core Requires: gnome-themes Requires: klogd Requires: xorg-x11-server-extra @@ -130,6 +130,15 @@ suited for the GNOME 2.x Desktop. GDM is a flexible X Window System display manager that has many options, is usable for remote login, and provides a good looking graphical interface. +%package -n gnome-applets-gdm +License: GPLv2+ +Summary: Panel Applets for GDM +Group: System/GUI/GNOME +Supplements: packageand(%{name}:gnome-panel) + +%description -n gnome-applets-gdm +This package provides panel applets for GDM, the GNOME display manager. + %lang_package %prep %setup -q @@ -239,8 +248,7 @@ fi %{_datadir}/icons/*/*/*/*.* %dir %{_prefix}/lib/gdm %{_prefix}/lib/gdm/gdm-* -%{_libdir}/bonobo/servers/* -%{_datadir}/gnome-2.0/ui/* +%exclude %{_prefix}/lib/gdm/gdm-user-switch-applet %attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm %attr(751,gdm,gdm) %dir %{_localstatedir}/run/gdm %attr(750,gdm,gdm) %dir %{_localstatedir}/log/gdm @@ -257,6 +265,12 @@ fi %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/gdm/custom.conf +%files -n gnome-applets-gdm +%defattr(-,root,root) +%{_prefix}/lib/gdm/gdm-user-switch-applet +%{_libdir}/bonobo/servers/GNOME_FastUserSwitchApplet.server +%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml + %files lang -f %{name}.lang %changelog From e41a43c736f1e364bd9b06c4e5a82590de5f01a2cbc5f450cdfd8e86f35a3cdc Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 27 May 2010 23:30:31 +0000 Subject: [PATCH 2/3] Accepting request 40764 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gdm via accept of submit request 40764 revision 2. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/40764 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=126 --- gdm.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gdm.spec b/gdm.spec index 8c814a9..61a709d 100644 --- a/gdm.spec +++ b/gdm.spec @@ -132,12 +132,13 @@ provides a good looking graphical interface. %package -n gnome-applets-gdm License: GPLv2+ -Summary: Panel Applets for GDM +Summary: Switch User Panel Applet Group: System/GUI/GNOME Supplements: packageand(%{name}:gnome-panel) %description -n gnome-applets-gdm -This package provides panel applets for GDM, the GNOME display manager. +This package provides the switch user panel applet, that uses GDM, +the GNOME display manager. %lang_package %prep @@ -246,9 +247,9 @@ fi %{_datadir}/pixmaps/*.png %{_datadir}/pixmaps/faces %{_datadir}/icons/*/*/*/*.* -%dir %{_prefix}/lib/gdm -%{_prefix}/lib/gdm/gdm-* -%exclude %{_prefix}/lib/gdm/gdm-user-switch-applet +%dir %{_libexecdir}/gdm +%{_libexecdir}/gdm/gdm-* +%exclude %{_libexecdir}/gdm/gdm-user-switch-applet %attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm %attr(751,gdm,gdm) %dir %{_localstatedir}/run/gdm %attr(750,gdm,gdm) %dir %{_localstatedir}/log/gdm @@ -267,7 +268,7 @@ fi %files -n gnome-applets-gdm %defattr(-,root,root) -%{_prefix}/lib/gdm/gdm-user-switch-applet +%{_libexecdir}/gdm/gdm-user-switch-applet %{_libdir}/bonobo/servers/GNOME_FastUserSwitchApplet.server %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml From 3b484fae8bb683f7799c03789966321167ff5e9cd86ce979df5a089a92d9ad9b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 28 May 2010 16:26:46 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/gdm revision 94.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=728f81052ef6bb997e0ef4309c85421a --- gdm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdm.spec b/gdm.spec index 61a709d..a7f5ede 100644 --- a/gdm.spec +++ b/gdm.spec @@ -42,7 +42,7 @@ BuildRequires: zenity License: GPLv2+ Group: System/GUI/GNOME Version: 2.30.2 -Release: 1 +Release: 2 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd