rpms/gnome-power-manager/FC-5 .cvsignore, 1.16, 1.17 gnome-power-manager.spec, 1.36, 1.37 sources, 1.16, 1.17

[fedora-cvs-commits at redhat.com]

Author: mclasen

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

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
2.14.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/FC-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	9 Apr 2006 17:52:28 -0000	1.16
+++ .cvsignore	25 Apr 2006 19:02:33 -0000	1.17
@@ -1 +1,2 @@
 gnome-power-manager-2.14.1.tar.bz2
+gnome-power-manager-2.14.2.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/FC-5/gnome-power-manager.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnome-power-manager.spec	9 Apr 2006 17:52:28 -0000	1.36
+++ gnome-power-manager.spec	25 Apr 2006 19:02:33 -0000	1.37
@@ -4,7 +4,7 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.14.1
+Version: 2.14.2
 Release: 1
 License: GPL
 Group: Applications/System
@@ -19,12 +19,16 @@
 BuildPrereq: libnotify-devel
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils >= 0.3.2
+BuildRequires: desktop-file-utils
 Requires: gnome-mime-data
 Requires: gnome-icon-theme
 Requires: hal >= %{hal_version}
 Requires: dbus-glib >= %{dbus_version}
 Requires: dbus-x11 >= %{dbus_version}
-Requires: scrollkeeper
+Requires(post): scrollkeeper
+Requires(post): GConf2
+Requires(preun): GConf2
+Requires(postun): scrollkeeper
 
 %description
 GNOME Power Manager uses the information and facilities provided by HAL 
@@ -60,19 +64,23 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gnome-power-manager.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
-done
-scrollkeeper-update
+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
 
+%preun
+if [ "$1" -eq 0 ]; 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
+
 %postun
-scrollkeeper-update
+scrollkeeper-update -q
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -90,6 +98,9 @@
 %{_datadir}/icons/hicolor/24x24/apps/*
 
 %changelog
+* Tue Apr 25 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
+- Update to 2.14.2
+
 * Sun Apr  9 2006 Ray Strode <rstrode at redhat.com> - 2.14.1-1
 - Update to 2.14.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/FC-5/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	9 Apr 2006 17:52:28 -0000	1.16
+++ sources	25 Apr 2006 19:02:33 -0000	1.17
@@ -1 +1 @@
-c1e392128c8f619390d28d719a0b9109  gnome-power-manager-2.14.1.tar.bz2
+c831d74fc578f40613d4cac326b0b3a2  gnome-power-manager-2.14.2.tar.bz2