rpms/gnome-power-manager/devel gnome-power-manager.spec, 1.123, 1.124

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30675

Modified Files:
	gnome-power-manager.spec 
Log Message:
fix a file conflict with gdm



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- gnome-power-manager.spec	14 Aug 2008 21:27:16 -0000	1.123
+++ gnome-power-manager.spec	25 Aug 2008 22:29:03 -0000	1.124
@@ -5,7 +5,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.23.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.23/gnome-power-manager-%{version}.tar.gz
@@ -75,6 +75,9 @@
   --dir $RPM_BUILD_ROOT%{_datadir}/gnome/autostart         		\
   $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/gnome-power-manager.desktop
 
+# this is provided by gdm now
+rm $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/gnome-power-manager.desktop
+
 %find_lang %name --with-gnome
 
 %clean
@@ -122,7 +125,6 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/dbus-1/services/gnome-power-manager.service
 %{_datadir}/gnome/autostart/gnome-power-manager.desktop
-%{_datadir}/gdm/autostart/LoginWindow/gnome-power-manager.desktop
 %{_datadir}/applications/gnome-power-preferences.desktop
 %{_datadir}/applications/gnome-power-statistics.desktop
 %{_datadir}/icons/hicolor/*/apps/*
@@ -132,6 +134,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Mon Aug 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.6-4
+- Drop the login session .desktop file, since gdm provides it now
+
 * Thu Aug 14 2008 David Zeuthen <davidz at redhat.com> - 2.23.6-3
 - Actually make the patch apply and rebuild