[gnome-power-manager] - New upstream release.

[Richard Hughes]

commit d0b2d77360846163686a1fe5824023d90407c0eb
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Oct 4 22:04:10 2010 +0100

    - New upstream release.

 .gitignore                                         |    1 +
 ...Don-t-crash-on-systems-which-don-t-have-X.patch |   27 --------------
 gnome-power-manager-2.31.6-backlight-is-None.patch |   13 -------
 ...ger-2.31.90-fix-step-for-legacy-backlight.patch |   38 --------------------
 gnome-power-manager.spec                           |   35 +++++++++---------
 sources                                            |    2 +-
 6 files changed, 20 insertions(+), 96 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 792d915..e5e36df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 gnome-power-manager-2.31.4.tar.bz2
 /gnome-power-manager-2.31.90.tar.bz2
 /gnome-power-manager-2.32.0.tar.bz2
+/gnome-power-manager-2.91.1.tar.gz
diff --git a/gnome-power-manager.spec b/gnome-power-manager.spec
index 51ccb08..19f3fab 100644
--- a/gnome-power-manager.spec
+++ b/gnome-power-manager.spec
@@ -1,10 +1,10 @@
 Summary: GNOME power management service
 Name: gnome-power-manager
-Version: 2.32.0
+Version: 2.91.1
 Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
-Source: http://download.gnome.org/sources/gnome-power-manager/2.32/gnome-power-manager-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-power-manager/2.91/gnome-power-manager-%{version}.tar.gz
 URL: http://projects.gnome.org/gnome-power-manager/
 
 BuildRequires: gnome-panel-devel >= 2.31.2
@@ -20,17 +20,11 @@ BuildRequires: upower-devel >= 0.9.0
 BuildRequires: intltool
 BuildRequires: glib2-devel >= 2.25.9
 BuildRequires: GConf2-devel >= 2.31.1
-BuildRequires: gtk2-devel >= 2.20
+BuildRequires: gtk3-devel >= 2.16.0
 BuildRequires: dbus-glib-devel
-BuildRequires: control-center-devel >= 2.31.4
+BuildRequires: control-center-devel >= 2.91.1
 BuildRequires: libwnck-devel
-BuildRequires: unique-devel
 Requires: gnome-icon-theme
-Requires: libcanberra
-Requires: dbus-x11
-Requires: upower >= 0.9.0
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
 
 # obsolete sub-package
 Obsoletes: gnome-power-manager-extra <= 2.30.1
@@ -43,9 +37,6 @@ displaying icons and handling user callbacks in an interactive GNOME session.
 %prep
 %setup -q
 
-# this file is shipped in the upstream tarball by mistake (#604625)
-rm -f policy/org.gnome.power.policy
-
 %build
 %configure --disable-scrollkeeper \
 	--disable-schemas-install \
@@ -55,6 +46,9 @@ make AM_LDFLAGS="-Wl,-O1,--as-needed"
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
+rm $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/libpower.a
+rm $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/libpower.la
+
 desktop-file-install --vendor gnome --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart                     \
   $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/gnome-power-manager.desktop
@@ -83,16 +77,18 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/*.la
 %post
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+    gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null || :
 fi
-glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %postun
 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 || :
 fi
-glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -114,12 +110,17 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas
 #%{_datadir}/gnome-2.0/ui/*.xml
 #%{_libdir}/bonobo/servers/*.server
 #%{_libexecdir}/*
-%{_libdir}/control-center-1/panels/*.so
+%{_datadir}/glib-2.0/schemas/*.gschema.xml
+%{_datadir}/GConf/gsettings/*.gschema.migrate
 %{_mandir}/man1/*.1.gz
 %{_sbindir}/*
 %{_sysconfdir}/xdg/autostart/*.desktop
+%{_libdir}/control-center-1/panels/libpower.so
 
 %changelog
+* Mon Oct 04 2010 Richard Hughes  <rhughes at redhat.com> - 2.91.1-1
+- New upstream release.
+
 * Tue Sep 28 2010 Matthias Clasen <mclasen at redhat.com> - 2.32.0-1
 - Update to 2.32.0
 
diff --git a/sources b/sources
index 575c4c6..cb60286 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9a08e85dce3ffb90775f15e3bda4adda  gnome-power-manager-2.32.0.tar.bz2
+14dd5d20c47966bb57df8a5ddebb52cc  gnome-power-manager-2.91.1.tar.gz