rpms/gdm/devel gdm.spec,1.254,1.255

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2107

Modified Files:
	gdm.spec 
Log Message:
Fix up file lists



Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- gdm.spec	5 Jun 2007 05:14:56 -0000	1.254
+++ gdm.spec	5 Jun 2007 05:38:28 -0000	1.255
@@ -193,34 +193,30 @@
 cp %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/gdm/BuiltInSessions/default.desktop
 
 # no dumb flexiserver thing, Xnest is too broken
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/gdmflexiserver-xnest.desktop
-
-# use patched gdmsetup desktop file
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/gdmsetup.desktop
-(cd $RPM_BUILD_ROOT%{_datadir}/applications; ln -sf ../desktop-menu-patches/gnome-gdmsetup.desktop .)
+rm -f $RPM_BUILD_ROOT%{_datadir}/gdm/applications/gdmflexiserver-xnest.desktop
 
 # use consolehelper for gdmsetup
 (cd $RPM_BUILD_ROOT/usr/bin; ln -sf consolehelper gdmsetup)
 
 # fix the "login photo" file
-cat >>$RPM_BUILD_ROOT%{_datadir}/applications/gdmphotosetup.desktop <<EOF
+cat >>$RPM_BUILD_ROOT%{_datadir}/gdm/applications/gdmphotosetup.desktop <<EOF
 NoDisplay=true
 EOF
  
 desktop-file-install --vendor gnome --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
+  --dir $RPM_BUILD_ROOT%{_datadir}/gdm/applications         \
   --remove-category Application				    \
-  $RPM_BUILD_ROOT%{_datadir}/applications/gdmphotosetup.desktop || :
+  $RPM_BUILD_ROOT%{_datadir}/gdm/applications/gdmphotosetup.desktop || :
 
 desktop-file-install --delete-original       			\
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             	\
+  --dir $RPM_BUILD_ROOT%{_datadir}/gdm/applications          	\
   --remove-category Application				    	\
-  $RPM_BUILD_ROOT%{_datadir}/applications/gdmflexiserver.desktop || :
+  $RPM_BUILD_ROOT%{_datadir}/gdm/applications/gdmflexiserver.desktop || :
 
 desktop-file-install --delete-original       			\
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             	\
+  --dir $RPM_BUILD_ROOT%{_datadir}/gdm/applications            	\
   --remove-category Application				    	\
-  $RPM_BUILD_ROOT%{_datadir}/applications/gdmflexiserver-xnest.desktop || :
+  $RPM_BUILD_ROOT%{_datadir}/gdm/applications/gdmflexiserver-xnest.desktop || :
 
 # broken install-data-local in gui/Makefile.am makes this necessary
 (cd $RPM_BUILD_ROOT%{_bindir} && ln -sf gdmXnestchooser gdmXnest)