rpms/gnome-power-manager/devel gnome-power-manager.spec,1.183,1.184

[Richard Hughes]

Author: rhughes

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

Modified Files:
	gnome-power-manager.spec 
Log Message:
* Mon Mar 15 2010 Richard Hughes  <rhughes at redhat.com> - 2.29.91-4
- Do not depend on Device-power, instead depend on upower.
- Update to the latest version of the Fedora Packaging Guidelines
- Do not run scrollkeeper-update
- Remove the custom BuildRoot
- Do not clean the buildroot before install
- Use the gconf_schema defines for the GConf schemas



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- gnome-power-manager.spec	15 Mar 2010 11:48:18 -0000	1.183
+++ gnome-power-manager.spec	15 Mar 2010 15:57:41 -0000	1.184
@@ -5,14 +5,13 @@
 Summary: GNOME power management service
 Name: gnome-power-manager
 Version: 2.29.91
-Release: 3%{?dist}
+Release: 4%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.29/gnome-power-manager-%{version}.tar.gz
 #Source:   http://download.gnome.org/sources/gnome-power-manager/2.29/%{name}-%{version}-%{?alphatag}.tar.gz
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gnome-power-manager/
 
 # http://git.gnome.org/browse/gnome-power-manager/commit/?id=fdcf156c85c10a6053b7364d882611df07000343
@@ -30,7 +29,7 @@ BuildRequires: libtool
 BuildRequires: cairo-devel
 BuildRequires: libcanberra-devel
 BuildRequires: unique-devel
-BuildRequires: DeviceKit-power-devel >= 008
+BuildRequires: upower-devel >= 0.9.0
 BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: intltool
 Requires: gtk2 >= 2.10.0
@@ -40,7 +39,7 @@ Requires: libcanberra
 Requires: dbus-glib >= %{dbus_version}
 Requires: dbus-x11 >= %{dbus_version}
 Requires: unique >= 0.9.4
-Requires: DeviceKit-power >= 008
+Requires: upower >= 0.9.0
 Requires: hal >= %{hal_version}
 Requires(post): scrollkeeper
 Requires(pre): GConf2
@@ -84,13 +83,12 @@ for p in *.po; do
 done
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 desktop-file-install --vendor gnome --delete-original                   \
-  --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart         		\
+  --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart                     \
   $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/gnome-power-manager.desktop
 
 # save space by linking identical images in translated docs
@@ -115,31 +113,19 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-	%{_sysconfdir}/gconf/schemas/gnome-power-manager.schemas >/dev/null || :
-scrollkeeper-update -q &> /dev/null || :
+%gconf_schema_upgrade gnome-power-manager.schemas
 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
+gconf_schema_prepare gnome-power-manager.schemas
 
 %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
+%gconf_schema_remove gnome-power-manager.schemas
 
 %postun
-scrollkeeper-update -q &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
     gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null || :
@@ -183,6 +169,14 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Mon Mar 15 2010 Richard Hughes  <rhughes at redhat.com> - 2.29.91-4
+- Do not depend on Device-power, instead depend on upower.
+- Update to the latest version of the Fedora Packaging Guidelines
+- Do not run scrollkeeper-update
+- Remove the custom BuildRoot
+- Do not clean the buildroot before install
+- Use the gconf_schema defines for the GConf schemas
+
 * Mon Mar 15 2010 Bastien Nocera <bnocera at redhat.com> 2.29.91-3
 - Really enable HAL build and fix compilation (#572896)