From c08dd66f46c51320469446fb6e9b23c6e110c781 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Wed, 2 Feb 2005 21:37:06 +0000
Subject: [PATCH] Fix file lists

---
 gnome-session.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnome-session.spec b/gnome-session.spec
index 07e27ea..7a1ff5f 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -46,6 +46,7 @@ Patch3: gnome-session-2.0.5-dithering.patch
 ## http://bugzilla.gnome.org/show_bug.cgi?id=106450
 Patch4: gnome-session-2.2.0.2-splash-repaint.patch
 Patch5: gnome-session-2.7.4-read-desktop-entries.patch
+Patch6: gnome-session-2.9.4-gnome-common.patch
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -74,13 +75,15 @@ GNOME components and handles logout and saving the session.
 %patch3 -p1 -b .dithering
 %patch4 -p1 -b .splash-repaint
 %patch5 -p1 -b .read-desktop-entries
+%patch6 -p1 -b .gnome-common
 
 %build
 
 #workaround broken perl-XML-Parser on 64bit arches
 export PERL5LIB=/usr/lib64/perl5/vendor_perl/5.8.2 perl
 
-automake-1.4
+aclocal
+automake
 autoheader
 autoconf
 
@@ -95,11 +98,11 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 desktop-file-install --vendor gnome --delete-original                   \
-  --dir $RPM_BUILD_ROOT%{_datadir}/control-center-2.0/capplets          \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications			        \
   --add-only-show-in GNOME                                              \
   --add-category Settings                                               \
   --add-category AdvancedSettings                                       \
-  $RPM_BUILD_ROOT%{_datadir}/control-center-2.0/capplets/*
+  $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 ./mkinstalldirs $RPM_BUILD_ROOT/etc/X11/gdm/Sessions/
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/gdm/Sessions/GNOME
@@ -140,7 +143,7 @@ done
 %doc AUTHORS COPYING ChangeLog NEWS README
 
 %{_datadir}/gnome
-%{_datadir}/control-center-2.0
+%{_datadir}/applications
 %{_datadir}/man/man*/*
 %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*.schemas