packages: xfce4-systemload-plugin/xfce4-systemload-plugin.spec, xfce4-syste...

[baggins]

Author: baggins                      Date: Tue Mar  1 12:37:46 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- port to libxfce4ui

---- Files affected:
packages/xfce4-systemload-plugin:
   xfce4-systemload-plugin.spec (1.21 -> 1.22) , xfce4-systemload-plugin-ui.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xfce4-systemload-plugin/xfce4-systemload-plugin.spec
diff -u packages/xfce4-systemload-plugin/xfce4-systemload-plugin.spec:1.21 packages/xfce4-systemload-plugin/xfce4-systemload-plugin.spec:1.22
--- packages/xfce4-systemload-plugin/xfce4-systemload-plugin.spec:1.21	Tue Feb 15 13:27:52 2011
+++ packages/xfce4-systemload-plugin/xfce4-systemload-plugin.spec	Tue Mar  1 13:37:41 2011
@@ -3,17 +3,19 @@
 Summary(pl.UTF-8):	Wtyczka Xfce wyświetlająca aktualne obciążenie systemu
 Name:		xfce4-systemload-plugin
 Version:	1.0.0
-Release:	1
+Release:	2
 License:	BSD-like (see COPYING)
 Group:		X11/Applications
 Source0:	http://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.0/%{name}-%{version}.tar.bz2
 # Source0-md5:	da4f0e8bfb57e18fe3e3e56507a681f7
+Patch0:		%{name}-ui.patch
 URL:		http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel
 BuildRequires:	intltool
 BuildRequires:	libtool
+BuildRequires:	libxfce4ui-devel
 BuildRequires:	pkgconfig
 BuildRequires:	xfce4-dev-tools >= 4.4.0
 BuildRequires:	xfce4-panel-devel >= 4.4.0
@@ -32,6 +34,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__intltoolize}
@@ -68,6 +71,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2011/03/01 12:37:41  baggins
+- rel 2
+- port to libxfce4ui
+
 Revision 1.21  2011/02/15 12:27:52  megabajt
 - updated to 1.0.0
 

================================================================
Index: packages/xfce4-systemload-plugin/xfce4-systemload-plugin-ui.patch
diff -u /dev/null packages/xfce4-systemload-plugin/xfce4-systemload-plugin-ui.patch:1.1
--- /dev/null	Tue Mar  1 13:37:46 2011
+++ packages/xfce4-systemload-plugin/xfce4-systemload-plugin-ui.patch	Tue Mar  1 13:37:41 2011
@@ -0,0 +1,69 @@
+diff -ur xfce4-systemload-plugin-1.0.0-orig/configure.ac xfce4-systemload-plugin-1.0.0/configure.ac
+--- xfce4-systemload-plugin-1.0.0-orig/configure.ac	2010-12-10 02:54:05.000000000 +0100
++++ xfce4-systemload-plugin-1.0.0/configure.ac	2011-03-01 13:33:11.956063513 +0100
+@@ -63,7 +63,7 @@
+ dnl ***********************************
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.1])
+-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.99.1])
++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.1])
+ 
+ dnl ***********************************
+diff -ur xfce4-systemload-plugin-1.0.0-orig/panel-plugin/cpu.c xfce4-systemload-plugin-1.0.0/panel-plugin/cpu.c
+--- xfce4-systemload-plugin-1.0.0-orig/panel-plugin/cpu.c	2010-12-09 17:04:10.000000000 +0100
++++ xfce4-systemload-plugin-1.0.0/panel-plugin/cpu.c	2011-03-01 13:33:39.908063511 +0100
+@@ -35,7 +35,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/dialogs.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include "cpu.h" 
+ 
+ #if defined(__linux__) || defined(__FreeBSD_kernel__)
+diff -ur xfce4-systemload-plugin-1.0.0-orig/panel-plugin/Makefile.am xfce4-systemload-plugin-1.0.0/panel-plugin/Makefile.am
+--- xfce4-systemload-plugin-1.0.0-orig/panel-plugin/Makefile.am	2010-12-09 17:04:10.000000000 +0100
++++ xfce4-systemload-plugin-1.0.0/panel-plugin/Makefile.am	2011-03-01 13:33:11.956063513 +0100
+@@ -22,13 +22,13 @@
+ xfce4_systemload_plugin_CFLAGS =					\
+ 	$(GTK_CFLAGS)							\
+ 	$(LIBXFCE4UTIL_CFLAGS)						\
+-	$(LIBXFCEGUI4_CFLAGS)						\
++	$(LIBXFCE4UI_CFLAGS)						\
+ 	$(LIBXFCE4PANEL_CFLAGS)						\
+ 	$(PLATFORM_CFLAGS)
+ 
+ xfce4_systemload_plugin_LDADD =						\
+ 	$(LIBXFCE4UTIL_LIBS)						\
+-	$(LIBXFCEGUI4_LIBS)						\
++	$(LIBXFCE4UI_LIBS)						\
+ 	$(LIBXFCE4PANEL_LIBS)
+ 
+ #
+diff -ur xfce4-systemload-plugin-1.0.0-orig/panel-plugin/systemload.c xfce4-systemload-plugin-1.0.0/panel-plugin/systemload.c
+--- xfce4-systemload-plugin-1.0.0-orig/panel-plugin/systemload.c	2010-12-09 17:04:10.000000000 +0100
++++ xfce4-systemload-plugin-1.0.0/panel-plugin/systemload.c	2011-03-01 13:33:11.957063512 +0100
+@@ -35,8 +35,8 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
+-#include <libxfce4panel/xfce-panel-plugin.h>
++#include <libxfce4ui/libxfce4ui.h>
++#include <libxfce4panel/libxfce4panel.h>
+ 
+ #include "cpu.h"
+ #include "memswap.h"
+diff -ur xfce4-systemload-plugin-1.0.0-orig/panel-plugin/uptime.c xfce4-systemload-plugin-1.0.0/panel-plugin/uptime.c
+--- xfce4-systemload-plugin-1.0.0-orig/panel-plugin/uptime.c	2010-12-09 17:04:10.000000000 +0100
++++ xfce4-systemload-plugin-1.0.0/panel-plugin/uptime.c	2011-03-01 13:34:01.452063513 +0100
+@@ -31,7 +31,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/dialogs.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include "uptime.h"
+ 
================================================================

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