rpms/gnome-power-manager/devel gnome-power-manager.spec,1.66,1.67

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19570

Modified Files:
	gnome-power-manager.spec 
Log Message:
2.17.2.1



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gnome-power-manager.spec	4 Oct 2006 18:47:33 -0000	1.66
+++ gnome-power-manager.spec	22 Oct 2006 00:54:35 -0000	1.67
@@ -4,15 +4,13 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.16.0
-Release: 3%{?dist}
+Version: 2.17.2.1
+Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
 Patch0: gnome-power-manager-2.15.4-nodefaultbeep.patch
 Patch1: gnome-power-manager-2.15.92-mnemonics.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=356150
-Patch2: gnome-power-manager-2.16.0-tray-icon.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome-power.sourceforge.net/
 BuildPrereq: libgnomeui-devel
@@ -33,6 +31,7 @@
 Requires: dbus-glib >= %{dbus_version}
 Requires: dbus-x11 >= %{dbus_version}
 Requires(post): scrollkeeper
+Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 Requires(postun): scrollkeeper
@@ -47,7 +46,6 @@
 %setup -q
 %patch0 -p1 -b .nodefaultbeep
 %patch1 -p1 -b .mnemonics
-%patch2 -p1 -b .tray-icon
 
 %build
 %configure \
@@ -64,7 +62,7 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 desktop-file-install --vendor gnome --delete-original                   \
-  --dir $RPM_BUILD_ROOT%{_datadir}/gnome/autostart         \
+  --dir $RPM_BUILD_ROOT%{_datadir}/gnome/autostart         		\
   $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/gnome-power-manager.desktop
 
 %find_lang %name
@@ -74,13 +72,21 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-power-manager.schemas >/dev/null
+gconftool-2 --makefile-install-rule \
+	%{_sysconfdir}/gconf/schemas/gnome-power-manager.schemas >/dev/null || :
 scrollkeeper-update -q
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
     gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gnome-power-manager.schemas > /dev/null || :
+fi
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -99,18 +105,22 @@
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/*
-%{_datadir}/gnome-power-manager/*
+%{_datadir}/gnome-power-manager
 %{_datadir}/man/*
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_sysconfdir}/dbus-1/system.d/gnome-power-manager.conf
 %{_datadir}/dbus-1/services/gnome-power-manager.service
-%{_datadir}/gnome/help/gnome-power-manager/*
-%{_datadir}/omf/gnome-power-manager/*
-%{_datadir}/gnome/autostart/*
+%{_datadir}/gnome/help/gnome-power-manager
+%{_datadir}/omf/gnome-power-manager
+%{_datadir}/gnome/autostart/gnome-power-manager.desktop
 %{_datadir}/applications/gnome-power-preferences.desktop
+%{_datadir}/applications/gnome-power-statistics.desktop
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Sat Oct 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.17.2.1-1
+- Update to 2.17.2.1
+
 * Wed Oct  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-3
 - Don't install a broken symlink (#208399)