[xfce4-clipman-plugin] Add patch to build with new exo

[Kevin Fenzi]

commit 7f959fb1dd2de01327efe271911c9cca4c410294
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Thu Jan 13 13:39:58 2011 -0700

    Add patch to build with new exo

 xfce4-clipman-plugin-1.1.3-use-exo.patch |   70 ++++++++++++++++++++++++++++++
 xfce4-clipman-plugin.spec                |   11 ++++-
 2 files changed, 80 insertions(+), 1 deletions(-)
---
diff --git a/xfce4-clipman-plugin-1.1.3-use-exo.patch b/xfce4-clipman-plugin-1.1.3-use-exo.patch
new file mode 100644
index 0000000..a164844
--- /dev/null
+++ b/xfce4-clipman-plugin-1.1.3-use-exo.patch
@@ -0,0 +1,70 @@
+Description: Fix build with exo 0.5.x
+Origin: backport, http://bugzilla.xfce.org/attachment.cgi?id=3201
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6853
+--- xfce4-clipman-plugin-1.1.3.orig/configure
++++ xfce4-clipman-plugin-1.1.3/configure
+@@ -12435,26 +12435,26 @@ $as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&
+   fi
+ 
+ 
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exo-0.3 >= 0.3.0" >&5
+-$as_echo_n "checking for exo-0.3 >= 0.3.0... " >&6; }
+-  if $PKG_CONFIG "--atleast-version=0.3.0" "exo-0.3" >/dev/null 2>&1; then
+-    EXO_VERSION=`$PKG_CONFIG --modversion "exo-0.3"`
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exo-1 >= 0.5.0" >&5
++$as_echo_n "checking for exo-1 >= 0.5.0... " >&6; }
++  if $PKG_CONFIG "--atleast-version=0.5.0" "exo-1" >/dev/null 2>&1; then
++    EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"`
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_VERSION" >&5
+ $as_echo "$EXO_VERSION" >&6; }
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking EXO_CFLAGS" >&5
+ $as_echo_n "checking EXO_CFLAGS... " >&6; }
+-    EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-0.3"`
++    EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"`
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_CFLAGS" >&5
+ $as_echo "$EXO_CFLAGS" >&6; }
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking EXO_LIBS" >&5
+ $as_echo_n "checking EXO_LIBS... " >&6; }
+-    EXO_LIBS=`$PKG_CONFIG --libs "exo-0.3"`
++    EXO_LIBS=`$PKG_CONFIG --libs "exo-1"`
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_LIBS" >&5
+ $as_echo "$EXO_LIBS" >&6; }
+ 
+-    EXO_REQUIRED_VERSION=0.3.0
++    EXO_REQUIRED_VERSION=0.5.0
+ 
+ 
+ 
+@@ -12462,15 +12462,15 @@ $as_echo "$EXO_LIBS" >&6; }
+ 
+ 
+ 
+-  elif $PKG_CONFIG --exists "exo-0.3" >/dev/null 2>&1; then
+-    xdt_cv_version=`$PKG_CONFIG --modversion "exo-0.3"`
++  elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then
++    xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"`
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5
+ $as_echo "found, but $xdt_cv_version" >&6; }
+ 
+ 
+-      echo "*** The required package exo-0.3 was found on your system,"
++      echo "*** The required package exo-1 was found on your system,"
+       echo "*** but the installed version ($xdt_cv_version) is too old."
+-      echo "*** Please upgrade exo-0.3 to atleast version 0.3.0, or adjust"
++      echo "*** Please upgrade exo-1 to atleast version 0.5.0, or adjust"
+       echo "*** the PKG_CONFIG_PATH environment variable if you installed"
+       echo "*** the new version of the package in a nonstandard prefix so"
+       echo "*** pkg-config is able to find it."
+@@ -12481,8 +12481,8 @@ $as_echo "found, but $xdt_cv_version" >&
+ $as_echo "not found" >&6; }
+ 
+ 
+-      echo "*** The required package exo-0.3 was not found on your system."
+-      echo "*** Please install exo-0.3 (atleast version 0.3.0) or adjust"
++      echo "*** The required package exo-1 was not found on your system."
++      echo "*** Please install exo-1 (atleast version 0.5.0) or adjust"
+       echo "*** the PKG_CONFIG_PATH environment variable if you"
+       echo "*** installed the package in a nonstandard prefix so that"
+       echo "*** pkg-config is able to find it."
diff --git a/xfce4-clipman-plugin.spec b/xfce4-clipman-plugin.spec
index cdbe1d4..e8c5b5f 100644
--- a/xfce4-clipman-plugin.spec
+++ b/xfce4-clipman-plugin.spec
@@ -1,6 +1,6 @@
 Name:           xfce4-clipman-plugin
 Version:        1.1.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Clipboard manager plugin for the Xfce panel
 
 Group:          User Interface/Desktops
@@ -12,6 +12,11 @@ Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/1.1/%{name}-%{
 # fixed with a rebased version of
 # http://git.xfce.org/panel-plugins/xfce4-clipman-plugin/commit/?id=d06e35ee62a0477adc84b5d7aeb29e348bb0b813
 Patch0:         xfce4-clipman-plugin-1.1.3-fix-possible-NULL-values.patch
+#
+# build with 4.7.x exo
+# http://bugzilla.xfce.org/show_bug.cgi?id=6853
+#
+Patch1:		xfce4-clipman-plugin-1.1.3-use-exo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfcegui4-devel >= 4.4.0
@@ -30,6 +35,7 @@ clipboard" option, and a drag-and-drop paste feature.
 %prep
 %setup -q
 %patch0 -p1 -b .null-value
+%patch1 -p1 -b .exo-build
 
 
 %build
@@ -91,6 +97,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Jan 13 2011 Kevin Fenzi <kevin at tummy.com> - 1.1.3-3
+- Add patch to build with new exo
+
 * Thu Jan 07 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.3-2
 - Fix possible NULL values (#552892 and #552895)