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

[megabajt]

Author: megabajt                     Date: Thu Feb 17 12:19:32 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added includes.patch (fixes build with xfce 4.8)
- release 4

---- Files affected:
packages/xfce4-sensors-plugin:
   xfce4-sensors-plugin.spec (1.18 -> 1.19) , includes.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.18 packages/xfce4-sensors-plugin/xfce4-sensors-plugin.spec:1.19
--- packages/xfce4-sensors-plugin/xfce4-sensors-plugin.spec:1.18	Sat Feb  5 17:02:10 2011
+++ packages/xfce4-sensors-plugin/xfce4-sensors-plugin.spec	Thu Feb 17 13:19:26 2011
@@ -3,13 +3,14 @@
 Summary(pl.UTF-8):	Wtyczka sensorów dla panelu Xfce
 Name:		xfce4-sensors-plugin
 Version:	1.0.0
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.0/%{name}-%{version}.tar.bz2
 # Source0-md5:	74d83628246536d575f954c76724982b
 URL:		http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin
 Patch0:		%{name}-configure_fix.patch
+Patch1:		includes.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel
@@ -17,11 +18,11 @@
 BuildRequires:	libtool
 BuildRequires:	lm_sensors-devel >= 2.8
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	rpmbuild(macros) >= 1.601
 BuildRequires:	xfce4-dev-tools >= 4.3.90.2
 BuildRequires:	xfce4-panel-devel >= 4.3.90.1
-Requires(post,postun):	gtk-update-icon-cache
-Requires(post,postun):	hicolor-icon-theme
+Requires:	gtk-update-icon-cache
+Requires:	hicolor-icon-theme
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		skip_post_check_so	libxfce4sensors.so.*
@@ -36,6 +37,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -83,6 +85,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2011/02/17 12:19:26  megabajt
+- added includes.patch (fixes build with xfce 4.8)
+- release 4
+
 Revision 1.18  2011/02/05 16:02:10  wiget
 - rel. 3
 

================================================================
Index: packages/xfce4-sensors-plugin/includes.patch
diff -u /dev/null packages/xfce4-sensors-plugin/includes.patch:1.1
--- /dev/null	Thu Feb 17 13:19:32 2011
+++ packages/xfce4-sensors-plugin/includes.patch	Thu Feb 17 13:19:26 2011
@@ -0,0 +1,37 @@
+diff -urN xfce4-sensors-plugin-1.0.0/include/sensors-interface-common.h xfce4-sensors-plugin-1.0.0.new//include/sensors-interface-common.h
+--- xfce4-sensors-plugin-1.0.0/include/sensors-interface-common.h	2010-03-28 18:11:33.000000000 +0000
++++ xfce4-sensors-plugin-1.0.0.new//include/sensors-interface-common.h	2011-02-17 11:59:15.459999142 +0000
+@@ -31,7 +31,7 @@
+ /* #include <glib/gprintf.h>  */
+ 
+ /* Xfce includes */
+-#include <libxfce4panel/xfce-panel-plugin.h>
++#include <libxfce4panel/libxfce4panel.h>
+ 
+ /* Package includes */
+ #include <types.h>
+diff -urN xfce4-sensors-plugin-1.0.0/panel-plugin/sensors-plugin.c xfce4-sensors-plugin-1.0.0.new//panel-plugin/sensors-plugin.c
+--- xfce4-sensors-plugin-1.0.0/panel-plugin/sensors-plugin.c	2010-03-28 18:14:19.000000000 +0000
++++ xfce4-sensors-plugin-1.0.0.new//panel-plugin/sensors-plugin.c	2011-02-17 11:57:46.630000004 +0000
+@@ -41,7 +41,7 @@
+ /* Xfce includes */
+ #include <libxfce4util/libxfce4util.h>
+ #include <libxfcegui4/libxfcegui4.h>
+-#include <libxfce4panel/xfce-panel-plugin.h>
++#include <libxfce4panel/libxfce4panel.h>
+ 
+ /* Package includes */
+ #include <configuration.h>
+diff -urN xfce4-sensors-plugin-1.0.0/src/Makefile.am xfce4-sensors-plugin-1.0.0.new//src/Makefile.am
+--- xfce4-sensors-plugin-1.0.0/src/Makefile.am	2009-11-06 11:02:11.000000000 +0000
++++ xfce4-sensors-plugin-1.0.0.new//src/Makefile.am	2011-02-17 12:13:21.563333271 +0000
+@@ -27,7 +27,8 @@
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ 	@LIBSENSORS_CFLAGS@	\
+ 	@LIBXFCE4UTIL_CFLAGS@ \
+-	@LIBXFCEGUI4_CFLAGS@
++	@LIBXFCEGUI4_CFLAGS@ \
++	@LIBXFCE4PANEL_CFLAGS@
+ 
+ # @GTK_CFLAGS@ 	\
+ # @GLIB_CFLAGS@ \
================================================================

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