- up to 0.7.0

diff --git a/xfce4-dict-ui.patch b/xfce4-dict-ui.patch
deleted file mode 100644 (file)
index ac9c92f..0000000
--- a/xfce4-dict-ui.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-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

diff --git a/xfce4-dict.spec b/xfce4-dict.spec
index 5fa10fa3a2d57b11f98ba1146c691d8fa4d22c96..f902bc7e169be6ad39da4c93b180597fa388fa67 100644 (file)
--- a/xfce4-dict.spec
+++ b/xfce4-dict.spec
@@ -1,24 +1,23 @@
 Summary:       Xfce4 Dictionary
 Summary(pl.UTF-8):     Słownik dla Xfce4
 Name:          xfce4-dict
-Version:       0.6.0
-Release:       5
+Version:       0.7.0
+Release:       1
 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
+Source0:       http://archive.xfce.org/src/apps/xfce4-dict/0.7/%{name}-%{version}.tar.bz2
+# Source0-md5: ceec37fe56a18c14ecad617e21acce69
 URL:           http://goodies.xfce.org/projects/applications/xfce4-dict
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
 BuildRequires: intltool
 BuildRequires: libtool
-BuildRequires: libxfce4ui-devel >= 4.8.0
+BuildRequires: libxfce4ui-devel >= 4.11.0
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.601
-BuildRequires: xfce4-dev-tools >= 4.6.0
-BuildRequires: xfce4-panel-devel >= 4.6.0
+BuildRequires: xfce4-dev-tools >= 4.11.0
+BuildRequires: xfce4-panel-devel >= 4.11.0
 Requires:      gtk-update-icon-cache
 Requires:      hicolor-icon-theme
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -41,7 +40,7 @@ Summary:      Xfce panel plugin for xfce4-dict
 Summary(pl.UTF-8):     Wtyczka dla panelu Xfce dla xfce4-dict
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
-Requires:      xfce4-panel >= 4.6.0
+Requires:      xfce4-panel >= 4.11.0
 
 %description plugin
 Xfce panel plugin for xfce4-dict.
@@ -51,7 +50,6 @@ Wtyczka dla panelu Xfce dla xfce4-dict.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -70,6 +68,7 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/libxfce4dict.la
 
 %find_lang %{name}
 
@@ -92,5 +91,5 @@ rm -rf $RPM_BUILD_ROOT
 
 %files plugin
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/xfce4-dict-plugin
-%{_datadir}/xfce4/panel-plugins/xfce4-dict-plugin.desktop
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libxfce4dict.so
+%{_datadir}/xfce4/panel/plugins/xfce4-dict-plugin.desktop