packages: xfce4-dict/xfce4-dict.spec, xfce4-dict/xfce4-dict-ui.patch (NEW) ...

baggins baggins at pld-linux.org
Tue Mar 1 00:51:40 CET 2011


Author: baggins                      Date: Mon Feb 28 23:51:40 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4
- port to libxfce4ui

---- Files affected:
packages/xfce4-dict:
   xfce4-dict.spec (1.4 -> 1.5) , xfce4-dict-ui.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xfce4-dict/xfce4-dict.spec
diff -u packages/xfce4-dict/xfce4-dict.spec:1.4 packages/xfce4-dict/xfce4-dict.spec:1.5
--- packages/xfce4-dict/xfce4-dict.spec:1.4	Thu Feb 17 00:04:15 2011
+++ packages/xfce4-dict/xfce4-dict.spec	Tue Mar  1 00:51:34 2011
@@ -3,15 +3,19 @@
 Summary(pl.UTF-8):	Słownik dla Xfce4
 Name:		xfce4-dict
 Version:	0.6.0
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://archive.xfce.org/src/apps/xfce4-dict/0.6/%{name}-%{version}.tar.bz2
 # Source0-md5:	c371c5c0bbe45a2bfac336cfe01dfe01
+Patch0:		%{name}-ui.patch
 URL:		http://goodies.xfce.org/projects/applications/xfce4-dict
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	gettext-devel
 BuildRequires:	intltool
-BuildRequires:	libxfcegui4-devel >= 4.6.0
+BuildRequires:	libtool
+BuildRequires:	libxfce4ui-devel >= 4.8.0
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.601
 BuildRequires:	xfce4-dev-tools >= 4.6.0
@@ -48,9 +52,16 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure
+
 %{__make}
 
 %install
@@ -91,6 +102,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2011/02/28 23:51:34  baggins
+- rel 4
+- port to libxfce4ui
+
 Revision 1.4  2011/02/16 23:04:15  megabajt
 - release 3
 

================================================================
Index: packages/xfce4-dict/xfce4-dict-ui.patch
diff -u /dev/null packages/xfce4-dict/xfce4-dict-ui.patch:1.1
--- /dev/null	Tue Mar  1 00:51:40 2011
+++ packages/xfce4-dict/xfce4-dict-ui.patch	Tue Mar  1 00:51:34 2011
@@ -0,0 +1,98 @@
+diff -ur xfce4-dict-0.6.0-orig/configure.in xfce4-dict-0.6.0/configure.in
+--- xfce4-dict-0.6.0-orig/configure.in	2009-12-31 01:04:33.000000000 +0100
++++ xfce4-dict-0.6.0/configure.in	2011-03-01 00:45:31.596764895 +0100
+@@ -37,7 +37,7 @@
+ dnl check for required packages
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0.0])
++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0.0])
+ XDT_CHECK_PACKAGE([X11], [x11])
+diff -ur xfce4-dict-0.6.0-orig/lib/Makefile.am xfce4-dict-0.6.0/lib/Makefile.am
+--- xfce4-dict-0.6.0-orig/lib/Makefile.am	2009-08-13 19:24:47.000000000 +0200
++++ xfce4-dict-0.6.0/lib/Makefile.am	2011-03-01 00:44:43.444764903 +0100
+@@ -26,14 +26,14 @@
+ 
+ libdict_la_CFLAGS =								\
+ 	-I$(top_srcdir)								\
+-	$(LIBXFCEGUI4_CFLAGS)						\
++	$(LIBXFCE4UI_CFLAGS)						\
+ 	$(LIBXFCE4PANEL_CFLAGS)						\
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"		\
+ 	@GTHREAD_CFLAGS@
+ 
+ libdict_la_LIBADD =								\
+ 	$(LIBXFCE4PANEL_LIBS)						\
+-	$(LIBXFCEGUI4_LIBS)							\
++	$(LIBXFCE4UI_LIBS)							\
+ 	@GTHREAD_LIBS@
+ 
+ 
+diff -ur xfce4-dict-0.6.0-orig/lib/prefs.c xfce4-dict-0.6.0/lib/prefs.c
+--- xfce4-dict-0.6.0-orig/lib/prefs.c	2009-08-24 23:06:02.000000000 +0200
++++ xfce4-dict-0.6.0/lib/prefs.c	2011-03-01 00:44:21.548764903 +0100
+@@ -27,7 +27,7 @@
+ 
+ #include <string.h>
+ #include <gtk/gtk.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include "common.h"
+ #include "prefs.h"
+diff -ur xfce4-dict-0.6.0-orig/panel-plugin/Makefile.am xfce4-dict-0.6.0/panel-plugin/Makefile.am
+--- xfce4-dict-0.6.0-orig/panel-plugin/Makefile.am	2009-11-17 20:42:38.000000000 +0100
++++ xfce4-dict-0.6.0/panel-plugin/Makefile.am	2011-03-01 00:44:54.097764898 +0100
+@@ -8,14 +8,14 @@
+ xfce4_dict_plugin_CFLAGS =						\
+ 	-I$(top_srcdir)								\
+ 	-I$(top_srcdir)/lib							\
+-	$(LIBXFCEGUI4_CFLAGS)						\
++	$(LIBXFCE4UI_CFLAGS)						\
+ 	$(LIBXFCE4PANEL_CFLAGS)						\
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"		\
+ 	@GTHREAD_CFLAGS@
+ 
+ xfce4_dict_plugin_LDADD =						\
+ 	$(LIBXFCE4PANEL_LIBS)						\
+-	$(LIBXFCEGUI4_LIBS)							\
++	$(LIBXFCE4UI_LIBS)							\
+ 	@GTHREAD_LIBS@								\
+ 	@X11_LIBS@								\
+ 	$(top_builddir)/lib/libdict.la
+diff -ur xfce4-dict-0.6.0-orig/panel-plugin/xfce4-dict-plugin.c xfce4-dict-0.6.0/panel-plugin/xfce4-dict-plugin.c
+--- xfce4-dict-0.6.0-orig/panel-plugin/xfce4-dict-plugin.c	2009-08-13 19:24:47.000000000 +0200
++++ xfce4-dict-0.6.0/panel-plugin/xfce4-dict-plugin.c	2011-03-01 00:45:57.673764902 +0100
+@@ -24,9 +24,8 @@
+ #include <stdlib.h>
+ #include <gtk/gtk.h>
+ 
+-#include <libxfcegui4/libxfcegui4.h>
+-#include <libxfce4panel/xfce-panel-plugin.h>
+-#include <libxfce4panel/xfce-panel-convenience.h>
++#include <libxfce4ui/libxfce4ui.h>
++#include <libxfce4panel/libxfce4panel.h>
+ 
+ #include <sys/types.h>
+ #include <sys/socket.h>
+diff -ur xfce4-dict-0.6.0-orig/src/Makefile.am xfce4-dict-0.6.0/src/Makefile.am
+--- xfce4-dict-0.6.0-orig/src/Makefile.am	2009-11-17 20:42:38.000000000 +0100
++++ xfce4-dict-0.6.0/src/Makefile.am	2011-03-01 00:45:11.803764898 +0100
+@@ -11,13 +11,14 @@
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"		\
+ 	-I$(top_srcdir)/lib							\
+ 	$(LIBXFCE4UTIL_CFLAGS)						\
++	$(LIBXFCE4UI_CFLAGS)						\
+ 	$(GTK_CFLAGS)								\
+ 	$(PLATFORM_CFLAGS)
+ 
+ xfce4_dict_LDADD =								\
+ 	$(GTK_LIBS)									\
+ 	$(LIBXFCE4UTIL_LIBS)						\
+-	$(LIBXFCEGUI4_LIBS)							\
++	$(LIBXFCE4UI_LIBS)							\
+ 	@GTHREAD_LIBS@								\
+ 	@X11_LIBS@								\
+ 	$(top_builddir)/lib/libdict.la
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce4-dict/xfce4-dict.spec?r1=1.4&r2=1.5&f=u



More information about the pld-cvs-commit mailing list