[xfce4-datetime-plugin] Patch for xfce4-panel 4.7

[Kevin Fenzi]

commit b19268751509caad0fe551e7d212f66720cd82d1
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Wed Jan 12 14:49:21 2011 -0700

    Patch for xfce4-panel 4.7

 xfce4-datetime-plugin-0.6.1-xfce4-panel-4.7.patch |   25 +++++++++++++++++++++
 xfce4-datetime-plugin.spec                        |   22 ++++++++++++------
 2 files changed, 40 insertions(+), 7 deletions(-)
---
diff --git a/xfce4-datetime-plugin-0.6.1-xfce4-panel-4.7.patch b/xfce4-datetime-plugin-0.6.1-xfce4-panel-4.7.patch
new file mode 100644
index 0000000..26393d6
--- /dev/null
+++ b/xfce4-datetime-plugin-0.6.1-xfce4-panel-4.7.patch
@@ -0,0 +1,25 @@
+diff -dur xfce4-datetime-plugin-0.6.1.orig/panel-plugin/datetime.desktop.in.in xfce4-datetime-plugin-0.6.1/panel-plugin/datetime.desktop.in.in
+--- xfce4-datetime-plugin-0.6.1.orig/panel-plugin/datetime.desktop.in.in	2008-04-21 06:21:45.000000000 +0200
++++ xfce4-datetime-plugin-0.6.1/panel-plugin/datetime.desktop.in.in	2010-12-19 00:50:46.951565622 +0100
+@@ -1,8 +1,7 @@
+ [Xfce Panel]
+ Type=X-XFCE-PanelPlugin
+-Encoding=UTF-8
+ _Name=DateTime
+ _Comment=Date and Time plugin with a simple calendar
+ Icon=xfce-schedule
+ X-XFCE-Module=datetime
+-X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
++X-XFCE-Internal=FALSE
+diff -dur xfce4-datetime-plugin-0.6.1.orig/panel-plugin/Makefile.in xfce4-datetime-plugin-0.6.1/panel-plugin/Makefile.in
+--- xfce4-datetime-plugin-0.6.1.orig/panel-plugin/Makefile.in	2008-11-19 08:10:36.000000000 +0100
++++ xfce4-datetime-plugin-0.6.1/panel-plugin/Makefile.in	2010-12-19 00:42:14.401423201 +0100
+@@ -252,7 +252,7 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-plugindir = $(libdir)/xfce4/panel-plugins/
++plugindir = $(libdir)/xfce4/panel/plugins/
+ plugin_LTLIBRARIES = \
+ 	libdatetime.la
+ 
diff --git a/xfce4-datetime-plugin.spec b/xfce4-datetime-plugin.spec
index 2d2b8a8..569ac00 100644
--- a/xfce4-datetime-plugin.spec
+++ b/xfce4-datetime-plugin.spec
@@ -1,23 +1,25 @@
 Name:           xfce4-datetime-plugin
 Version:        0.6.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Date/time plugin for the Xfce panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
-Patch0:         xfce4-datetime-plugin-0.5.0-multilib.patch
+Patch0:        xfce4-datetime-plugin-0.6.1-xfce4-panel-4.7.patch
 # http://git.xfce.org/panel-plugins/xfce4-datetime-plugin/commit/?id=7770996215eeca0f5e5f89bdcc4df94acc1d9415
 Patch1:         xfce4-datetime-plugin-0.6.1-tooltips.patch
 # contains all translations from 
 # http://translations.xfce.org/projects/p/xfce4-dateime-plugin/c/master/ 
 # as of 2010-12-18
 Patch2:         xfce4-datetime-plugin-0.6.1-update-translations.patch
+# http://bugzilla.xfce.org/show_bug.cgi?id=6443
+#Patch3:         xfce4-datetime-plugin-0.6.1-port-to-libxfce4ui.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfce4-panel-devel >= 4.3.99.2
-BuildRequires:  libxfcegui4-devel  >= 4.3.99.2
+BuildRequires:  libxfcegui4-devel >= 4.3.99.2
 BuildRequires:  libxml2-devel
 BuildRequires:  gettext, intltool
 Requires:       xfce4-panel >= 4.4.0
@@ -29,9 +31,12 @@ left-click on it.
 
 %prep
 %setup -q
-%patch0 -p0 -b .multilib
+%patch0 -p1 -b .xfce4-panel-4.7
 %patch1 -p1 -b .tooltips
 %patch2 -p1 -b .update-translations
+#%patch3 -p1 -b .port-to-libxfce4ui
+#autoreconf
+
 
 %build
 %configure --disable-static
@@ -40,7 +45,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
@@ -52,11 +57,14 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS THANKS
-%{_libdir}/xfce4/panel-plugins/*.so
-%{_libdir}/xfce4/panel-plugins/*.desktop
+%{_libdir}/xfce4/panel/plugins/*.so
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 
 %changelog
+* Sun Dec 19 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.1-6
+- Patch for xfce4-panel 4.7
+
 * Sat Dec 18 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.1-5
 - Bring back tooltips (#609129)
 - Update translations from Xfce Transifex