packages: xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin.spec, xfce4...

[lisu]

Author: lisu                         Date: Tue Jul 12 08:30:08 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build with libxfce4ui

---- Files affected:
packages/xfce4-smartbookmark-plugin:
   xfce4-smartbookmark-plugin.spec (1.8 -> 1.9) , xfce4-smartbookmark-plugin-ui.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin.spec
diff -u packages/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin.spec:1.8 packages/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin.spec:1.9
--- packages/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin.spec:1.8	Thu Feb 17 12:15:15 2011
+++ packages/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin.spec	Tue Jul 12 10:30:03 2011
@@ -9,12 +9,14 @@
 Source0:	http://goodies.xfce.org/releases/xfce4-smartbookmark-plugin/%{name}-%{version}.tar.gz
 # Source0-md5:	284e26595637dd2e900b75534372496b
 Patch0:		%{name}-startup.patch
+Patch1:		%{name}-ui.patch
 URL:		http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-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
+%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -68,6 +71,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2011/07/12 08:30:03  lisu
+- fix build with libxfce4ui
+
 Revision 1.8  2011/02/17 11:15:15  megabajt
 - release 4
 

================================================================
Index: packages/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-ui.patch
diff -u /dev/null packages/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-ui.patch:1.1
--- /dev/null	Tue Jul 12 10:30:08 2011
+++ packages/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-ui.patch	Tue Jul 12 10:30:03 2011
@@ -0,0 +1,44 @@
+--- xfce4-smartbookmark-plugin-0.4.2/src/smartbookmark.c~	2006-08-12 19:41:44.000000000 +0200
++++ xfce4-smartbookmark-plugin-0.4.2/src/smartbookmark.c	2011-07-12 10:19:54.915229439 +0200
+@@ -43,8 +43,8 @@
+ #include <gdk/gdkx.h>
+ 
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/dialogs.h>
+-#include <libxfce4panel/xfce-panel-plugin.h>
++#include <libxfce4ui/libxfce4ui.h>
++#include <libxfce4panel/libxfce4panel.h>
+ 
+ /*
+  * Types
+--- xfce4-smartbookmark-plugin-0.4.2/configure.ac~	2006-08-12 19:41:44.000000000 +0200
++++ xfce4-smartbookmark-plugin-0.4.2/configure.ac	2011-07-12 10:25:01.693729429 +0200
+@@ -25,7 +25,7 @@
+ dnl Check for required packages
+ XDT_CHECK_LIBX11_REQUIRE()
+ XDT_CHECK_PACKAGE([GDK], [gdk-2.0], [2.0])
+-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfce4panel-1.0], [4.2])
++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.2])
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
+ 
+ XDT_FEATURE_DEBUG()
+--- xfce4-smartbookmark-plugin-0.4.2/src/Makefile.am~	2006-08-12 19:41:44.000000000 +0200
++++ xfce4-smartbookmark-plugin-0.4.2/src/Makefile.am	2011-07-12 10:26:47.798229430 +0200
+@@ -8,7 +8,7 @@
+ 	-avoid-version							\
+ 	-module						\
+ 	@LIBXFCE4PANEL_LIBS@ \
+-	@LIBXFCEGUI4_LIBS@	\
++	@LIBXFCE4UI_LIBS@	\
+ 	@GDK_LIBS@	\
+ 	@LIBX11_LDFLAGS@
+ 
+@@ -19,7 +19,7 @@
+ libsmartbookmark_la_CFLAGS =	 \
+ 	-O0		\
+ 	-I$(top_srcdir) \
+-	@LIBXFCEGUI4_CFLAGS@ \
++	@LIBXFCE4UI_CFLAGS@ \
+ 	@LIBXFCE4PANEL_CFLAGS@ \
+ 	@LIBX11_CFLAGS@	\
+ 	@GDK_CFLAGS@	\
================================================================

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