[gnome-power-manager/f14/master] * Fri Aug 06 2010 Richard Hughes <richard at hughsie.com> 2.31.6-1 - New upstream release. - This is 2.

Fri Aug 6 15:43:53 UTC 2010

commit 27d4d21230f42f519624251fb577a091e133a0be
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Aug 6 16:43:47 2010 +0100

    * Fri Aug 06 2010 Richard Hughes <richard at hughsie.com> 2.31.6-1
    - New upstream release.
    - This is 2.31.6, which is forked from the gnome-2-30 branch.
    - If you have been using 2.31.5 or any earlier 2.31 version, then you will
      notice the UI and functionality going back in time. This is unfortunate.

 .gitignore                                 |    1 +
 gnome-power-manager-2.31.6-fix-build.patch |   13 ++++++++
 gnome-power-manager.spec                   |   47 ++++++++++++++++++++-------
 sources                                    |    2 +-
 4 files changed, 50 insertions(+), 13 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 9ebf5ed..2135795 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gnome-power-manager-2.31.4.tar.bz2
+gnome-power-manager-2.31.6.tar.gz
diff --git a/gnome-power-manager-2.31.6-fix-build.patch b/gnome-power-manager-2.31.6-fix-build.patch
new file mode 100644
index 0000000..d1ad432
--- /dev/null
+++ b/gnome-power-manager-2.31.6-fix-build.patch
@@ -0,0 +1,13 @@
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index dda8e2b..0afea66 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -12,7 +12,7 @@ data/gnome-power-statistics.desktop.in.in
+ [type: gettext/glade]data/gpm-feedback-widget.ui
+ [type: gettext/glade]data/gpm-statistics.ui
+ [type: gettext/glade]data/gpm-prefs.ui
+-policy/org.gnome.power.policy.in
++policy/org.gnome.power.policy.in2
+ src/gpm-backlight.c
+ src/gpm-backlight-helper.c
+ src/gpm-button.c
diff --git a/gnome-power-manager.spec b/gnome-power-manager.spec
index 8c72ad4..91f7ebd 100644
--- a/gnome-power-manager.spec
+++ b/gnome-power-manager.spec
@@ -1,12 +1,15 @@
 Summary: GNOME power management service
 Name: gnome-power-manager
-Version: 2.31.4
+Version: 2.31.6
 Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
-Source: http://download.gnome.org/sources/gnome-power-manager/2.31/gnome-power-manager-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-power-manager/2.31/gnome-power-manager-%{version}.tar.gz
 URL: http://projects.gnome.org/gnome-power-manager/
 
+# Fix build...
+Patch0:    gnome-power-manager-2.31.6-fix-build.patch
+
 BuildRequires: gnome-panel-devel >= 2.31.2
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils >= 0.3.2
@@ -18,9 +21,10 @@ BuildRequires: libcanberra-devel
 BuildRequires: libnotify-devel >= 0.5.0
 BuildRequires: upower-devel >= 0.9.0
 BuildRequires: intltool
+BuildRequires: unique-devel >= 1.0.0
 BuildRequires: glib2-devel >= 2.25.9
 BuildRequires: GConf2-devel >= 2.31.1
-BuildRequires: gtk3-devel >= 2.90.3
+BuildRequires: gtk2-devel >= 2.16.0
 BuildRequires: dbus-glib-devel
 BuildRequires: control-center-devel >= 2.31.4
 Requires: gnome-icon-theme
@@ -40,6 +44,7 @@ displaying icons and handling user callbacks in an interactive GNOME session.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-build
 
 %build
 %configure --disable-scrollkeeper \
@@ -82,24 +87,38 @@ for f in $helpdir/C/figures/*.png; do
   done
 done
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/*.la
-
 %find_lang %name --with-gnome
 
 %post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+        %{_sysconfdir}/gconf/schemas/gnome-power-manager.schemas >/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
+    gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
+%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`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gnome-power-manager.schemas &> /dev/null || :
 fi
-glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas
 
 %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 || :
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -107,8 +126,6 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/gnome-power-manager.service
-%{_datadir}/glib-2.0/schemas/*.gschema.xml
-%{_datadir}/GConf/gsettings/*.gschema.migrate
 %{_datadir}/gnome-power-manager/*.ui
 %{_datadir}/gnome-power-manager/icons/hicolor/*/*/*.*
 %{_datadir}/icons/hicolor/*/apps/gnome-brightness-applet.*
@@ -121,12 +138,18 @@ 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
+%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
 %{_mandir}/man1/*.1.gz
 %{_sbindir}/*
 %{_sysconfdir}/xdg/autostart/*.desktop
 
 %changelog
+* Fri Aug 06 2010 Richard Hughes <richard at hughsie.com> 2.31.6-1
+- New upstream release.
+- This is 2.31.6, which is forked from the gnome-2-30 branch.
+- If you have been using 2.31.5 or any earlier 2.31 version, then you will
+  notice the UI and functionality going back in time. This is unfortunate.
+
 * Thu Jul 01 2010 Richard Hughes  <rhughes at redhat.com> - 2.31.4-1
 - New upstream release.
 
diff --git a/sources b/sources
index 40f5789..02ffb7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f0e10a6d74bda867e738ea1ad3a412dc  gnome-power-manager-2.31.4.tar.bz2
+b2455a6db38b5ce9f180fe55d39a2645  gnome-power-manager-2.31.6.tar.gz
