up to 4.4.2. Build the plugin as a module.

diff --git a/xfce4-eyes-plugin-ui.patch b/xfce4-eyes-plugin-ui.patch
deleted file mode 100644 (file)
index c60cb2c..0000000
--- a/xfce4-eyes-plugin-ui.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ur xfce4-eyes-plugin-4.4.1-orig/configure.ac xfce4-eyes-plugin-4.4.1/configure.ac
---- xfce4-eyes-plugin-4.4.1-orig/configure.ac  2010-12-17 17:38:26.000000000 +0100
-+++ xfce4-eyes-plugin-4.4.1/configure.ac       2011-03-01 11:48:12.466067636 +0100
-@@ -61,7 +61,7 @@
- dnl ***********************************
- 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.3.90.2])
-+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
- XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2])
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.1])
- 
-diff -ur xfce4-eyes-plugin-4.4.1-orig/panel-plugin/eyes.c xfce4-eyes-plugin-4.4.1/panel-plugin/eyes.c
---- xfce4-eyes-plugin-4.4.1-orig/panel-plugin/eyes.c   2010-12-17 04:48:17.000000000 +0100
-+++ xfce4-eyes-plugin-4.4.1/panel-plugin/eyes.c        2011-03-01 11:22:54.644067640 +0100
-@@ -33,7 +33,7 @@
- #include <stdlib.h>
- 
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- 
- #include "eyes.h"
- #include "themes.h"
-diff -ur xfce4-eyes-plugin-4.4.1-orig/panel-plugin/eyes.h xfce4-eyes-plugin-4.4.1/panel-plugin/eyes.h
---- xfce4-eyes-plugin-4.4.1-orig/panel-plugin/eyes.h   2010-12-17 04:48:17.000000000 +0100
-+++ xfce4-eyes-plugin-4.4.1/panel-plugin/eyes.h        2011-03-01 11:27:42.255067643 +0100
-@@ -19,7 +19,7 @@
- #define __EYES_H__
- 
- #include <gtk/gtk.h>
--#include <libxfce4panel/xfce-panel-plugin.h>
-+#include <libxfce4panel/libxfce4panel.h>
- 
- typedef struct
- {
-diff -ur xfce4-eyes-plugin-4.4.1-orig/panel-plugin/Makefile.am xfce4-eyes-plugin-4.4.1/panel-plugin/Makefile.am
---- xfce4-eyes-plugin-4.4.1-orig/panel-plugin/Makefile.am      2010-12-17 04:48:17.000000000 +0100
-+++ xfce4-eyes-plugin-4.4.1/panel-plugin/Makefile.am   2011-03-01 11:42:08.074067641 +0100
-@@ -13,12 +13,12 @@
-       themes.c
- 
- xfce4_eyes_plugin_CFLAGS =                                            \
--      $(LIBXFCEGUI4_CFLAGS)                                           \
-+      $(LIBXFCE4UI_CFLAGS)                                            \
-       $(LIBXFCE4PANEL_CFLAGS)
-       
- xfce4_eyes_plugin_LDADD =                                             \
-       $(LIBXFCE4PANEL_LIBS)                                           \
--      $(LIBXFCEGUI4_LIBS)
-+      $(LIBXFCE4UI_LIBS)
- 
- desktopdir = $(datadir)/xfce4/panel-plugins
- desktop_in_in_files = eyes.desktop.in.in

diff --git a/xfce4-eyes-plugin.spec b/xfce4-eyes-plugin.spec
index b075fcadf44a51fe30f5bfa9f1f60777dd5d0414..7f4cfdb1ba1f591cb1e7364fafa55a7d1c2de793 100644 (file)
--- a/xfce4-eyes-plugin.spec
+++ b/xfce4-eyes-plugin.spec
@@ -1,13 +1,12 @@
 Summary:       A eyes plugin for Xfce panel
 Summary(pl.UTF-8):     Wtyczka eyes dla panelu Xfce
 Name:          xfce4-eyes-plugin
-Version:       4.4.1
-Release:       3
+Version:       4.4.2
+Release:       1
 License:       GPL v2
 Group:         X11/Applications
 Source0:       http://archive.xfce.org/src/panel-plugins/xfce4-eyes-plugin/4.4/%{name}-%{version}.tar.bz2
-# Source0-md5: dcbf6ea9035d379d168b479be0d09f14
-Patch0:                %{name}-ui.patch
+# Source0-md5: 1ef352c68dd8929c9e8743200b758b3c
 URL:           http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.8
@@ -17,7 +16,7 @@ BuildRequires:        libxfce4ui-devel
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.601
 BuildRequires: xfce4-dev-tools >= 4.4.0
-BuildRequires: xfce4-panel-devel >= 4.4.0
+BuildRequires: xfce4-panel-devel >= 4.9.0
 Requires:      gtk-update-icon-cache
 Requires:      hicolor-icon-theme
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -31,7 +30,6 @@ użytkownika.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__intltoolize}
@@ -46,11 +44,12 @@ użytkownika.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/libeyes.la
+
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ur_PK
 
 %find_lang %{name}
 
@@ -65,8 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/xfce4-eyes-plugin
-%{_datadir}/xfce4/panel-plugins/eyes.desktop
+%doc AUTHORS ChangeLog README NEWS
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libeyes.so
+%{_datadir}/xfce4/panel/plugins/eyes.desktop
 %{_datadir}/xfce4/eyes
 %{_iconsdir}/hicolor/*/apps/xfce4-eyes.png