[almanah] rebuild to fix broken deps, support libedataserverui-3.0

[Tom Callaway]

commit 7293dd65ff77aa8787b093b5e63a6b525859602d
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Fri Feb 4 12:38:59 2011 -0500

    rebuild to fix broken deps, support libedataserverui-3.0

 almanah-0.7.3-libedataserverui-3.0.patch |   47 ++++++++++++++++++++++++++++++
 almanah.spec                             |    7 ++++-
 2 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/almanah-0.7.3-libedataserverui-3.0.patch b/almanah-0.7.3-libedataserverui-3.0.patch
new file mode 100644
index 0000000..69f1e3f
--- /dev/null
+++ b/almanah-0.7.3-libedataserverui-3.0.patch
@@ -0,0 +1,47 @@
+diff -up almanah-0.7.3/configure.BAD almanah-0.7.3/configure
+--- almanah-0.7.3/configure.BAD	2011-02-04 12:32:57.137002595 -0500
++++ almanah-0.7.3/configure	2011-02-04 12:33:11.370003001 -0500
+@@ -18488,12 +18488,12 @@ if test -n "$EVO_CFLAGS"; then
+     pkg_cv_EVO_CFLAGS="$EVO_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libecal-1.2 libedataserver-1.2 libedataserverui-1.2\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "libecal-1.2 libedataserver-1.2 libedataserverui-1.2") 2>&5
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libecal-1.2 libedataserver-1.2 libedataserverui-3.0\"") >&5
++  ($PKG_CONFIG --exists --print-errors "libecal-1.2 libedataserver-1.2 libedataserverui-3.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_EVO_CFLAGS=`$PKG_CONFIG --cflags "libecal-1.2 libedataserver-1.2 libedataserverui-1.2" 2>/dev/null`
++  pkg_cv_EVO_CFLAGS=`$PKG_CONFIG --cflags "libecal-1.2 libedataserver-1.2 libedataserverui-3.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -18504,12 +18504,12 @@ if test -n "$EVO_LIBS"; then
+     pkg_cv_EVO_LIBS="$EVO_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libecal-1.2 libedataserver-1.2 libedataserverui-1.2\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "libecal-1.2 libedataserver-1.2 libedataserverui-1.2") 2>&5
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libecal-1.2 libedataserver-1.2 libedataserverui-3.0\"") >&5
++  ($PKG_CONFIG --exists --print-errors "libecal-1.2 libedataserver-1.2 libedataserverui-3.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_EVO_LIBS=`$PKG_CONFIG --libs "libecal-1.2 libedataserver-1.2 libedataserverui-1.2" 2>/dev/null`
++  pkg_cv_EVO_LIBS=`$PKG_CONFIG --libs "libecal-1.2 libedataserver-1.2 libedataserverui-3.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -18527,9 +18527,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        EVO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libecal-1.2 libedataserver-1.2 libedataserverui-1.2" 2>&1`
++	        EVO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libecal-1.2 libedataserver-1.2 libedataserverui-3.0" 2>&1`
+         else
+-	        EVO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libecal-1.2 libedataserver-1.2 libedataserverui-1.2" 2>&1`
++	        EVO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libecal-1.2 libedataserver-1.2 libedataserverui-3.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EVO_PKG_ERRORS" >&5
diff --git a/almanah.spec b/almanah.spec
index b0aad84..e47bd48 100644
--- a/almanah.spec
+++ b/almanah.spec
@@ -2,13 +2,14 @@
 
 Name:		almanah
 Version:	0.7.3
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Application for keeping an encrypted diary
 
 Group:		Applications/Productivity
 License:	GPLv3+
 URL:		http://tecnocode.co.uk/projects/almanah/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/almanah/%{majorVersion}/%{name}-%{version}.tar.gz
+Patch0:		almanah-0.7.3-libedataserverui-3.0.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gettext
@@ -35,6 +36,7 @@ diary entries using multiple events.
 
 %prep
 %setup -q
+%patch0 -p1 -b .libedataserverui-3.0
 sed -e 's/_//' \
     -e 's/=Diary/=Almanah/' \
     -i data/%{name}.desktop.in
@@ -99,6 +101,9 @@ fi
 
 
 %changelog 
+* Fri Feb  4 2011 Tom Callaway <spot at fedoraproject.org> - 0.7.3-7
+- rebuild again to fix broken deps, support new libedataserverui
+
 * Wed Jan 12 2011 Milan Crha <mcrha at redhat.com> - 0.7.3-6
 - Rebuild against newer evolution-data-server