From 1304e7923c0a97ccc1e0de52d85e810ebc0165fe Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: May 07 2009 14:43:03 +0000 Subject: - Update to todays git snapshot - Drop upstreamed patches --- diff --git a/.cvsignore b/.cvsignore index 906a40d..59ccd18 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-power-manager-2.26.0.tar.gz +gnome-power-manager-2.27.1-20090507.tar.gz diff --git a/gnome-power-manager-2.26.0-cast.patch b/gnome-power-manager-2.26.0-cast.patch deleted file mode 100644 index 4e1c8ea..0000000 --- a/gnome-power-manager-2.26.0-cast.patch +++ /dev/null @@ -1,16 +0,0 @@ -My 34% battery looked like 1460578104% w/o this. - -Lubomir Rintel - -diff -up gnome-power-manager-2.26.0/src/gpm-engine.c.cast gnome-power-manager-2.26.0/src/gpm-engine.c ---- gnome-power-manager-2.26.0/src/gpm-engine.c.cast 2009-04-12 10:55:11.065927796 +0200 -+++ gnome-power-manager-2.26.0/src/gpm-engine.c 2009-04-12 10:55:34.424928595 +0200 -@@ -484,7 +484,7 @@ gpm_engine_device_check_capacity (GpmEng - ret = gconf_client_get_bool (engine->priv->conf, GPM_CONF_NOTIFY_LOW_CAPACITY, NULL); - if (ret) { - egg_debug ("** EMIT: low-capacity"); -- g_signal_emit (engine, signals [LOW_CAPACITY], 0, obj->type, obj->capacity); -+ g_signal_emit (engine, signals [LOW_CAPACITY], 0, obj->type, (guint)obj->capacity); - } - return TRUE; - } diff --git a/gnome-power-manager.spec b/gnome-power-manager.spec index 03f207a..0a99ca0 100644 --- a/gnome-power-manager.spec +++ b/gnome-power-manager.spec @@ -1,14 +1,16 @@ %define hal_version 0.5.8 %define dbus_version 0.61 +%define alphatag 20090507 Summary: GNOME Power Manager Name: gnome-power-manager -Version: 2.26.0 -Release: 3%{?dist} +Version: 2.27.1 +#Release: 1%{?dist} +Release: 0.1.%{?alphatag}git%{?dist} License: GPLv2+ and GFDL Group: Applications/System -Source: http://download.gnome.org/sources/gnome-power-manager/2.25/gnome-power-manager-%{version}.tar.gz -Patch0: gnome-power-manager-2.26.0-cast.patch +#Source: http://download.gnome.org/sources/gnome-power-manager/2.27/gnome-power-manager-%{version}.tar.gz +Source: http://download.gnome.org/sources/gnome-power-manager/2.27/%{name}-%{version}-%{?alphatag}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://projects.gnome.org/gnome-power-manager/ @@ -29,7 +31,7 @@ BuildRequires: libcanberra-devel BuildRequires: unique-devel BuildRequires: PolicyKit-devel BuildRequires: PolicyKit-gnome-devel -BuildRequires: DeviceKit-devel >= 002 +BuildRequires: DeviceKit-power-devel >= 007 BuildRequires: intltool Requires: gtk2 >= 2.10.0 Requires: gnome-icon-theme @@ -41,7 +43,7 @@ Requires: dbus-x11 >= %{dbus_version} Requires: unique >= 0.9.4 Requires: PolicyKit Requires: PolicyKit-authentication-agent -Requires: DeviceKit-power >= 003 +Requires: DeviceKit-power >= 007 Requires(post): scrollkeeper Requires(pre): GConf2 Requires(post): GConf2 @@ -55,8 +57,8 @@ GNOME Power Preferences allows authorised users to set policy and change preferences. %prep -%setup -q -%patch0 -p1 -b .cast +#%setup -q +%setup -q -n %{?name}-%{?version}-%{?alphatag} %build %configure \ @@ -158,12 +160,14 @@ fi %{_datadir}/applications/gnome-power-preferences.desktop %{_datadir}/applications/gnome-power-statistics.desktop %{_datadir}/icons/hicolor/*/apps/* -%{_libdir}/bonobo/servers/GNOME_BrightnessApplet.server -%{_libdir}/bonobo/servers/GNOME_InhibitApplet.server -%{_datadir}/gnome-2.0/ui/GNOME_BrightnessApplet.xml -%{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml +%{_libdir}/bonobo/servers/GNOME_*.server +%{_datadir}/gnome-2.0/ui/GNOME_*.xml %changelog +* Thu May 07 2009 Richard Hughes - 2.27.1-0.1.20090507git +- Update to todays git snapshot +- Drop upstreamed patches + * Mon Apr 27 2009 Matthias Clasen - 2.26.0-3 - Don't drop schemas translations from po files diff --git a/sources b/sources index 210b80e..8e8cdf4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a5382f2e14ac8dfa0b582d9e089ac3d gnome-power-manager-2.26.0.tar.gz +f03460715de4f742cf8c595353471a44 gnome-power-manager-2.27.1-20090507.tar.gz