packages: xfce4-sensors-plugin/xfce4-sensors-plugin.spec, xfce4-sensors-plu...
baggins
baggins at pld-linux.org
Tue Mar 1 13:32:35 CET 2011
Author: baggins Date: Tue Mar 1 12:32:35 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 5
- port to libxfce4ui
---- Files affected:
packages/xfce4-sensors-plugin:
xfce4-sensors-plugin.spec (1.19 -> 1.20) , xfce4-sensors-plugin-ui.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/xfce4-sensors-plugin/xfce4-sensors-plugin.spec
diff -u packages/xfce4-sensors-plugin/xfce4-sensors-plugin.spec:1.19 packages/xfce4-sensors-plugin/xfce4-sensors-plugin.spec:1.20
--- packages/xfce4-sensors-plugin/xfce4-sensors-plugin.spec:1.19 Thu Feb 17 13:19:26 2011
+++ packages/xfce4-sensors-plugin/xfce4-sensors-plugin.spec Tue Mar 1 13:32:29 2011
@@ -3,7 +3,7 @@
Summary(pl.UTF-8): Wtyczka sensorów dla panelu Xfce
Name: xfce4-sensors-plugin
Version: 1.0.0
-Release: 4
+Release: 5
License: GPL v2
Group: X11/Applications
Source0: http://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.0/%{name}-%{version}.tar.bz2
@@ -11,11 +11,13 @@
URL: http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin
Patch0: %{name}-configure_fix.patch
Patch1: includes.patch
+Patch2: %{name}-ui.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gettext-devel
BuildRequires: intltool
BuildRequires: libtool
+BuildRequires: libxfce4ui-devel
BuildRequires: lm_sensors-devel >= 2.8
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.601
@@ -38,6 +40,7 @@
%setup -q
%patch0 -p0
%patch1 -p1
+%patch2 -p1
%build
%{__intltoolize}
@@ -85,6 +88,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.20 2011/03/01 12:32:29 baggins
+- rel 5
+- port to libxfce4ui
+
Revision 1.19 2011/02/17 12:19:26 megabajt
- added includes.patch (fixes build with xfce 4.8)
- release 4
================================================================
Index: packages/xfce4-sensors-plugin/xfce4-sensors-plugin-ui.patch
diff -u /dev/null packages/xfce4-sensors-plugin/xfce4-sensors-plugin-ui.patch:1.1
--- /dev/null Tue Mar 1 13:32:35 2011
+++ packages/xfce4-sensors-plugin/xfce4-sensors-plugin-ui.patch Tue Mar 1 13:32:29 2011
@@ -0,0 +1,186 @@
+diff -ur xfce4-sensors-plugin-1.0.0-orig/configure.in xfce4-sensors-plugin-1.0.0/configure.in
+--- xfce4-sensors-plugin-1.0.0-orig/configure.in 2011-03-01 11:20:41.483067640 +0100
++++ xfce4-sensors-plugin-1.0.0/configure.in 2011-03-01 13:28:53.982063513 +0100
+@@ -304,7 +304,7 @@
+ dnl *** Check for Xfce packages ***
+ dnl **************************************
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
+-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
+
+ dnl configure the panel plugin
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
+diff -ur xfce4-sensors-plugin-1.0.0-orig/lib/configuration.c xfce4-sensors-plugin-1.0.0/lib/configuration.c
+--- xfce4-sensors-plugin-1.0.0-orig/lib/configuration.c 2010-03-28 20:15:24.000000000 +0200
++++ xfce4-sensors-plugin-1.0.0/lib/configuration.c 2011-03-01 13:28:53.983063513 +0100
+@@ -30,7 +30,7 @@
+
+ /* Xfce includes */
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfce4panel/xfce-panel-plugin.h>
++#include <libxfce4panel/libxfce4panel.h>
+
+ /* Package includes */
+ #include <configuration.h>
+diff -ur xfce4-sensors-plugin-1.0.0-orig/lib/Makefile.am xfce4-sensors-plugin-1.0.0/lib/Makefile.am
+--- xfce4-sensors-plugin-1.0.0-orig/lib/Makefile.am 2010-03-27 16:11:48.000000000 +0100
++++ xfce4-sensors-plugin-1.0.0/lib/Makefile.am 2011-03-01 13:28:53.983063513 +0100
+@@ -42,7 +42,7 @@
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ @GTK_CFLAGS@ \
+ @GLIB_CFLAGS@ \
+- @LIBXFCEGUI4_CFLAGS@ \
++ @LIBXFCE4UI_CFLAGS@ \
+ @LIBXFCE4UTIL_CFLAGS@ \
+ @LIBXFCE4PANEL_CFLAGS@ \
+ @LIBSENSORS_CFLAGS@
+@@ -54,7 +54,7 @@
+ # @GTK_CFLAGS@ \
+ # @GLIB_CFLAGS@ \
+ # @LIBXFCE4UTIL_CFLAGS@ \
+-# @LIBXFCEGUI4_CFLAGS@
++# @LIBXFCE4UI_CFLAGS@
+
+ libxfce4sensors_la_LDFLAGS = \
+ -export-dynamic \
+@@ -71,7 +71,7 @@
+ @GTK_LIBS@ \
+ @GLIB_LIBS@ \
+ @LIBXFCE4UTIL_LIBS@ \
+- @LIBXFCEGUI4_LIBS@ \
++ @LIBXFCE4UI_LIBS@ \
+ @LIBXFCE4PANEL_LIBS@ \
+ @LIBSENSORS_LDFLAGS@
+
+@@ -82,7 +82,7 @@
+ # @GTK_LIBS@ \
+ # @GLIB_LIBS@ \
+ # @LIBXFCE4UTIL_LIBS@ \
+-# @LIBXFCEGUI4_LIBS@
++# @LIBXFCE4UI_LIBS@
+
+ #@SOLLIBS@
+
+diff -ur xfce4-sensors-plugin-1.0.0-orig/lib/sensors-interface.c xfce4-sensors-plugin-1.0.0/lib/sensors-interface.c
+--- xfce4-sensors-plugin-1.0.0-orig/lib/sensors-interface.c 2010-03-27 16:11:48.000000000 +0100
++++ xfce4-sensors-plugin-1.0.0/lib/sensors-interface.c 2011-03-01 13:28:53.987063513 +0100
+@@ -34,7 +34,7 @@
+ #include <gtk/gtk.h>
+
+ /* Xfce includes */
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ /* Package includes */
+ #include <sensors-interface-common.h>
+diff -ur xfce4-sensors-plugin-1.0.0-orig/lib/sensors-interface-common.c xfce4-sensors-plugin-1.0.0/lib/sensors-interface-common.c
+--- xfce4-sensors-plugin-1.0.0-orig/lib/sensors-interface-common.c 2010-03-27 16:11:48.000000000 +0100
++++ xfce4-sensors-plugin-1.0.0/lib/sensors-interface-common.c 2011-03-01 13:28:53.988063513 +0100
+@@ -23,9 +23,8 @@
+ #endif
+
+ /* Xfce includes */
+-// #include <libxfce4panel/xfce-panel-enums.h>
+ #include <gtk/gtk.h>
+-#include <libxfce4panel/xfce-panel-plugin.h>
++#include <libxfce4panel/libxfce4panel.h>
+
+ /* Local/package includes */
+ #include <configuration.h>
+diff -ur xfce4-sensors-plugin-1.0.0-orig/panel-plugin/Makefile.am xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.am
+--- xfce4-sensors-plugin-1.0.0-orig/panel-plugin/Makefile.am 2009-11-06 12:02:11.000000000 +0100
++++ xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.am 2011-03-01 13:28:53.994063513 +0100
+@@ -20,6 +20,7 @@
+
+ xfce4_sensors_plugin_CFLAGS = \
+ @LIBXFCE4PANEL_CFLAGS@ \
++ @LIBXFCE4UI_CFLAGS@ \
+ @PLATFORM_CFLAGS@ \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ @LIBSENSORS_CFLAGS@
+@@ -30,6 +31,7 @@
+ xfce4_sensors_plugin_LDFLAGS = \
+ $(top_builddir)/lib/libxfce4sensors.la
+ @LIBXFCE4PANEL_LIBS@ \
++ @LIBXFCE4UI_LIBS@ \
+ @SOLLIBS@ \
+ @LIBSENSORS_LDFLAGS@
+
+diff -ur xfce4-sensors-plugin-1.0.0-orig/panel-plugin/sensors-plugin.c xfce4-sensors-plugin-1.0.0/panel-plugin/sensors-plugin.c
+--- xfce4-sensors-plugin-1.0.0-orig/panel-plugin/sensors-plugin.c 2011-03-01 11:20:41.485067641 +0100
++++ xfce4-sensors-plugin-1.0.0/panel-plugin/sensors-plugin.c 2011-03-01 13:29:31.784063500 +0100
+@@ -40,7 +40,7 @@
+
+ /* Xfce includes */
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <libxfce4panel/libxfce4panel.h>
+
+ /* Package includes */
+@@ -1007,7 +1007,7 @@
+
+ g_return_val_if_fail ( sensors->exec_command, FALSE);
+
+- xfce_exec (sensors->command_name, FALSE, FALSE, NULL);
++ xfce_spawn_command_line_on_screen(gdk_screen_get_default(), sensors->command_name, FALSE, FALSE, NULL);
+
+ TRACE ("leaves execute_command with TRUE");
+
+diff -ur xfce4-sensors-plugin-1.0.0-orig/src/actions.c xfce4-sensors-plugin-1.0.0/src/actions.c
+--- xfce4-sensors-plugin-1.0.0-orig/src/actions.c 2010-03-27 16:11:48.000000000 +0100
++++ xfce4-sensors-plugin-1.0.0/src/actions.c 2011-03-01 13:28:53.989063513 +0100
+@@ -28,7 +28,7 @@
+ #include <gtk/gtk.h>
+
+ /* Xfce includes */
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ /* Package includes */
+ #include <middlelayer.h>
+diff -ur xfce4-sensors-plugin-1.0.0-orig/src/callbacks.c xfce4-sensors-plugin-1.0.0/src/callbacks.c
+--- xfce4-sensors-plugin-1.0.0-orig/src/callbacks.c 2010-03-28 20:25:46.000000000 +0200
++++ xfce4-sensors-plugin-1.0.0/src/callbacks.c 2011-03-01 13:28:53.990063513 +0100
+@@ -27,7 +27,7 @@
+ #include <stdlib.h>
+
+ /* Xfce includes */
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ /* Package includes */
+ #include <sensors-interface.h>
+diff -ur xfce4-sensors-plugin-1.0.0-orig/src/interface.c xfce4-sensors-plugin-1.0.0/src/interface.c
+--- xfce4-sensors-plugin-1.0.0-orig/src/interface.c 2010-03-27 21:01:21.000000000 +0100
++++ xfce4-sensors-plugin-1.0.0/src/interface.c 2011-03-01 13:28:53.991063513 +0100
+@@ -24,7 +24,7 @@
+ #endif
+
+ /* Xfce includes */
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ /* Package includes */
+ #include <cpu.h>
+diff -ur xfce4-sensors-plugin-1.0.0-orig/src/Makefile.am xfce4-sensors-plugin-1.0.0/src/Makefile.am
+--- xfce4-sensors-plugin-1.0.0-orig/src/Makefile.am 2011-03-01 11:20:41.486067640 +0100
++++ xfce4-sensors-plugin-1.0.0/src/Makefile.am 2011-03-01 13:28:53.991063513 +0100
+@@ -27,7 +27,7 @@
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ @LIBSENSORS_CFLAGS@ \
+ @LIBXFCE4UTIL_CFLAGS@ \
+- @LIBXFCEGUI4_CFLAGS@ \
++ @LIBXFCE4UI_CFLAGS@ \
+ @LIBXFCE4PANEL_CFLAGS@
+
+ # @GTK_CFLAGS@ \
+@@ -42,7 +42,7 @@
+ $(top_builddir)/lib/libxfce4sensors.la \
+ @LIBSENSORS_LDFLAGS@ \
+ @LIBXFCE4UTIL_LIBS@ \
+- @LIBXFCEGUI4_LIBS@
++ @LIBXFCE4UI_LIBS@
+
+ # @GTK_LIBS@ \
+ # @GLIB_LIBS@ \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce4-sensors-plugin/xfce4-sensors-plugin.spec?r1=1.19&r2=1.20&f=u
More information about the pld-cvs-commit
mailing list