packages: xfce4-battery-plugin/xfce4-battery-plugin.spec, xfce4-battery-plu...

[baggins]

Author: baggins                      Date: Tue Mar  1 11:17:42 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- port to libxfce4ui

---- Files affected:
packages/xfce4-battery-plugin:
   xfce4-battery-plugin.spec (1.24 -> 1.25) , xfce4-battery-plugin-ui.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xfce4-battery-plugin/xfce4-battery-plugin.spec
diff -u packages/xfce4-battery-plugin/xfce4-battery-plugin.spec:1.24 packages/xfce4-battery-plugin/xfce4-battery-plugin.spec:1.25
--- packages/xfce4-battery-plugin/xfce4-battery-plugin.spec:1.24	Mon Feb 14 22:44:49 2011
+++ packages/xfce4-battery-plugin/xfce4-battery-plugin.spec	Tue Mar  1 12:17:36 2011
@@ -3,16 +3,18 @@
 Summary(pl.UTF-8):	Monitor zużycia baterii dla panelu Xfce
 Name:		xfce4-battery-plugin
 Version:	1.0.0
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.0/%{name}-%{version}.tar.bz2
 # Source0-md5:	2696307f34f6b9630fcaaea102004e78
+Patch0:		%{name}-ui.patch
 URL:		http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake
 BuildRequires:	intltool
 BuildRequires:	libtool
+BuildRequires:	libxfce4ui-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.601
 BuildRequires:	xfce4-dev-tools >= 4.4.0
@@ -30,6 +32,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__intltoolize}
@@ -76,6 +79,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2011/03/01 11:17:36  baggins
+- rel 2
+- port to libxfce4ui
+
 Revision 1.24  2011/02/14 21:44:49  megabajt
 - updated to 1.0.0
 - removed obsolete -headers_fix.patch and -buildfix.patch

================================================================
Index: packages/xfce4-battery-plugin/xfce4-battery-plugin-ui.patch
diff -u /dev/null packages/xfce4-battery-plugin/xfce4-battery-plugin-ui.patch:1.1
--- /dev/null	Tue Mar  1 12:17:42 2011
+++ packages/xfce4-battery-plugin/xfce4-battery-plugin-ui.patch	Tue Mar  1 12:17:36 2011
@@ -0,0 +1,66 @@
+diff -ur xfce4-battery-plugin-1.0.0-orig/configure.ac xfce4-battery-plugin-1.0.0/configure.ac
+--- xfce4-battery-plugin-1.0.0-orig/configure.ac	2011-01-03 14:54:16.000000000 +0100
++++ xfce4-battery-plugin-1.0.0/configure.ac	2011-03-01 12:05:31.976989137 +0100
+@@ -67,7 +67,7 @@
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2])
+-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90.2])
+ 
+ dnl ***********************************
+diff -ur xfce4-battery-plugin-1.0.0-orig/panel-plugin/battery.c xfce4-battery-plugin-1.0.0/panel-plugin/battery.c
+--- xfce4-battery-plugin-1.0.0-orig/panel-plugin/battery.c	2011-01-03 13:38:40.000000000 +0100
++++ xfce4-battery-plugin-1.0.0/panel-plugin/battery.c	2011-03-01 12:08:11.823872637 +0100
+@@ -47,10 +47,10 @@
+ #include <stdlib.h>
+ 
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include <gtk/gtk.h>
+-#include <libxfce4panel/xfce-panel-plugin.h>
++#include <libxfce4panel/libxfce4panel.h>
+ 
+ #include "libacpi.h"
+ 
+@@ -588,7 +588,7 @@
+                 int interm=(battmon->options.action_on_critical == BM_COMMAND_TERM)?1:0;
+                 if (!battmon->options.command_on_critical ||
+                     !strlen(battmon->options.command_on_critical)) goto do_critical_warn;
+-                xfce_exec (battmon->options.command_on_critical, interm, 0, NULL);
++                xfce_spawn_command_line_on_screen(gdk_screen_get_default(), battmon->options.command_on_critical, interm, 0, NULL);
+             }
+         } else if (!battmon->low){
+                 battmon->low = TRUE;
+@@ -606,7 +606,7 @@
+                 int interm=(battmon->options.action_on_low == BM_COMMAND_TERM)?1:0;
+                 if (!battmon->options.command_on_low ||
+                     !strlen(battmon->options.command_on_low)) goto do_low_warn;
+-                xfce_exec(battmon->options.command_on_low, interm, 0, NULL);
++                xfce_spawn_command_line_on_screen(gdk_screen_get_default(), battmon->options.command_on_low, interm, 0, NULL);
+             }
+         }
+     }
+diff -ur xfce4-battery-plugin-1.0.0-orig/panel-plugin/Makefile.am xfce4-battery-plugin-1.0.0/panel-plugin/Makefile.am
+--- xfce4-battery-plugin-1.0.0-orig/panel-plugin/Makefile.am	2011-01-03 13:38:40.000000000 +0100
++++ xfce4-battery-plugin-1.0.0/panel-plugin/Makefile.am	2011-03-01 12:05:31.980991141 +0100
+@@ -22,14 +22,14 @@
+ 
+ xfce4_battery_plugin_CFLAGS =						\
+ 	$(LIBXFCE4PANEL_CFLAGS)						\
+-	$(LIBXFCEGUI4_CFLAGS)						\
++	$(LIBXFCE4UI_CFLAGS)						\
+ 	$(LIBXFCE4UTIL_CFLAGS)						\
+ 	$(GTK_CFLAGS)							\
+ 	$(PLATFORM_CFLAGS)
+ 
+ xfce4_battery_plugin_LDADD =						\
+ 	$(LIBXFCE4PANEL_LIBS)						\
+-	$(LIBXFCEGUI4_LIBS)						\
++	$(LIBXFCE4UI_LIBS)						\
+ 	$(LIBXFCE4UTIL_LIBS)						\
+ 	$(GTK_LIBS)
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce4-battery-plugin/xfce4-battery-plugin.spec?r1=1.24&r2=1.25&f=u