diff --git a/gdm-metacity.patch b/gdm-metacity.patch new file mode 100644 index 0000000..291d3e7 --- /dev/null +++ b/gdm-metacity.patch @@ -0,0 +1,61 @@ +Index: data/greeter-autostart/Makefile.am +=================================================================== +--- data/greeter-autostart/Makefile.am (revision 6433) ++++ data/greeter-autostart/Makefile.am (working copy) +@@ -19,6 +19,7 @@ + gnome-power-manager.desktop.in \ + gnome-settings-daemon.desktop.in \ + gok.desktop.in \ ++ metacity.desktop.in \ + orca-screen-reader.desktop.in \ + $(NULL) + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +Index: data/greeter-autostart/metacity.desktop.in +=================================================================== +--- data/greeter-autostart/metacity.desktop.in (revision 0) ++++ data/greeter-autostart/metacity.desktop.in (revision 0) +@@ -0,0 +1,20 @@ ++[Desktop Entry] ++Type=Application ++Encoding=UTF-8 ++_Name=Metacity ++Exec=metacity ++# name of loadable control center module ++X-GNOME-WMSettingsModule=metacity ++# name we put on the WM spec check window ++X-GNOME-WMName=Metacity ++# back compat only ++X-GnomeWMSettingsLibrary=metacity ++X-GNOME-Bugzilla-Bugzilla=GNOME ++X-GNOME-Bugzilla-Product=metacity ++X-GNOME-Bugzilla-Component=general ++X-GNOME-Autostart-Phase=WindowManager ++X-GNOME-Provides=windowmanager ++X-GNOME-Autostart-Notify=true ++ ++[Window Manager] ++SessionManaged=true +Index: po/POTFILES.in +=================================================================== +--- po/POTFILES.in (revision 6433) ++++ po/POTFILES.in (working copy) +@@ -56,6 +56,7 @@ + data/greeter-autostart/gnome-settings-daemon.desktop.in.in + data/greeter-autostart/gnome-mag.desktop.in + data/greeter-autostart/gok.desktop.in ++data/greeter-autostart/metacity.desktop.in + data/greeter-autostart/orca-screen-reader.desktop.in + gui/simple-chooser/gdm-host-chooser-dialog.c + gui/simple-chooser/gdm-host-chooser-widget.c +Index: po/ChangeLog +=================================================================== +--- po/ChangeLog (revision 6433) ++++ po/ChangeLog (working copy) +@@ -1,3 +1,7 @@ ++2008-08-25 William Jon McCann ++ ++ * POTFILES.in: Update list ++ + 2008-08-25 Tomasz Dominikowski + + * pl.po: Updated Polish translation diff --git a/gdm.spec b/gdm.spec index 276d3f3..8374543 100644 --- a/gdm.spec +++ b/gdm.spec @@ -16,7 +16,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.23.90 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -80,6 +80,8 @@ BuildRequires: libxklavier-devel Requires: audit-libs >= %{libauditver} Patch1: xkb-groups.patch +Patch2: gdm-metacity.patch + # Fedora-specific Patch99: gdm-2.23.1-fedora-logo.patch @@ -101,6 +103,7 @@ multiple simulanteous logged in users. %prep %setup -q %patch1 -p1 -b .xkb-groups +%patch2 -p0 -b .metacity %patch99 -p1 -b .fedora-logo autoreconf @@ -301,6 +304,9 @@ fi %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Mon Aug 25 2008 Jon McCann - 1:2.23.90-2 +- Add desktop file for metacity + * Mon Aug 25 2008 Jon McCann - 1:2.23.90-1 - Update to 2.23.90