rpms/gnome-power-manager/F-12 0001-Use-gnome-settings-daemon-popup-code.patch, 1.2, 1.3 gnome-power-manager.spec, 1.179, 1.180

[Bastien Nocera]

Author: hadess

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

Modified Files:
	0001-Use-gnome-settings-daemon-popup-code.patch 
	gnome-power-manager.spec 
Log Message:
Fix patch application

0001-Use-gnome-settings-daemon-popup-code.patch:
 b/data/Makefile.am            |    3 
 b/data/acme.ui                |   41 +
 b/src/Makefile.am             |    5 
 b/src/gpm-backlight.c         |   39 +
 b/src/gsd-media-keys-window.c | 1109 ++++++++++++++++++++++++++++++++++++++++++
 b/src/gsd-media-keys-window.h |   70 ++
 src/gpm-popup-window.c        |  725 ---------------------------
 src/gpm-popup-window.h        |   61 --
 8 files changed, 1256 insertions(+), 797 deletions(-)

Index: 0001-Use-gnome-settings-daemon-popup-code.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/0001-Use-gnome-settings-daemon-popup-code.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 0001-Use-gnome-settings-daemon-popup-code.patch	28 Oct 2009 00:19:23 -0000	1.2
+++ 0001-Use-gnome-settings-daemon-popup-code.patch	28 Oct 2009 10:43:10 -0000	1.3
@@ -1,4 +1,4 @@
-From 06027e758cb2ae16671282e81266119d613d3349 Mon Sep 17 00:00:00 2001
+From d28e419aa83da01295f7c5729e87baa55996fb11 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 27 Oct 2009 23:33:46 +0000
 Subject: [PATCH] Use gnome-settings-daemon popup code
@@ -992,7 +992,7 @@ index ad3e33e..0000000
 -#endif
 diff --git a/src/gsd-media-keys-window.c b/src/gsd-media-keys-window.c
 new file mode 100644
-index 0000000..3f7bd3a
+index 0000000..80f4e4d
 --- /dev/null
 +++ b/src/gsd-media-keys-window.c
 @@ -0,0 +1,1109 @@
@@ -1632,16 +1632,16 @@ index 0000000..3f7bd3a
 +                   double              width,
 +                   double              height)
 +{
-+        gdouble  x1;
-+        GdkColor color;
-+        double   r, g, b;
++        gdouble   x1;
++        GdkColor  color;
++        double    r, g, b;
 +        GtkStyle *style;
 +
 +        _x0 += 0.5;
 +        _y0 += 0.5;
 +        height = round (height) - 1;
 +        width = round (width) - 1;
-+        x1 = round ((width - 2) * percentage);
++        x1 = round ((width - 1) * percentage);
 +        style = gtk_widget_get_style (GTK_WIDGET (window));
 +
 +        /* bar background */
@@ -1669,7 +1669,7 @@ index 0000000..3f7bd3a
 +        r = (float)color.red / 65535.0;
 +        g = (float)color.green / 65535.0;
 +        b = (float)color.blue / 65535.0;
-+        rounded_rectangle (cr, 1.0, _x0 + 0.5, _y0 + 0.5, height / 8, x1, height - 2);
++        rounded_rectangle (cr, 1.0, _x0 + 0.5, _y0 + 0.5, height / 6 - 0.5, x1, height - 1);
 +        cairo_set_source_rgba (cr, r, g, b, FG_ALPHA);
 +        cairo_fill (cr);
 +}


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/gnome-power-manager.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- gnome-power-manager.spec	27 Oct 2009 23:43:19 -0000	1.179
+++ gnome-power-manager.spec	28 Oct 2009 10:43:11 -0000	1.180
@@ -23,6 +23,7 @@ Patch2: 0002-Make-the-left-and-right-but
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=594664
 %define		_default_patch_fuzz 2
+BuildRequires: autoconf automake libtool
 Patch3: 0001-Use-gnome-settings-daemon-popup-code.patch
 
 BuildRequires: libwnck-devel
@@ -75,6 +76,7 @@ Extra GNOME power management application
 %patch1 -p1 -b .remove-help
 %patch2 -p1 -b .uni-menu
 %patch3 -p1 -b .osd
+autoreconf -i
 
 %build
 %configure \