[kdepim/f14/master] - build against libassuan1 (f14+)

[Rex Dieter]

commit 9b0e177f4652df1bbdf6865a8623acb1c04a6c5c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Aug 11 14:03:56 2010 -0500

    - build against libassuan1 (f14+)

 kdepim-4.4.5-libassuan1.patch |   37 +++++++++++++++++++++++++++++++++++++
 kdepim.spec                   |   22 +++++++++++++++++++---
 2 files changed, 56 insertions(+), 3 deletions(-)
---
diff --git a/kdepim-4.4.5-libassuan1.patch b/kdepim-4.4.5-libassuan1.patch
new file mode 100644
index 0000000..3986a5c
--- /dev/null
+++ b/kdepim-4.4.5-libassuan1.patch
@@ -0,0 +1,37 @@
+diff -up kdepim-4.4.5/cmake/modules/FindAssuan.cmake.libassuan1 kdepim-4.4.5/cmake/modules/FindAssuan.cmake
+--- kdepim-4.4.5/cmake/modules/FindAssuan.cmake.libassuan1	2009-02-04 12:19:54.000000000 -0600
++++ kdepim-4.4.5/cmake/modules/FindAssuan.cmake	2010-08-11 13:56:02.663356542 -0500
+@@ -48,7 +48,7 @@ include (MacroEnsureVersion)
+ 
+ if ( WIN32 )
+ 
+-  # On Windows, we don't have a libassuan-config script, so we need to
++  # On Windows, we don't have a libassuan1-config script, so we need to
+   # look for the stuff ourselves:
+ 
+   # in cmake, AND and OR have the same precedence, there's no
+@@ -144,7 +144,7 @@ if ( WIN32 )
+ 
+ else() # not WIN32
+ 
+-  # On *nix, we have the libassuan-config script which can tell us all we
++  # On *nix, we have the libassuan1-config script which can tell us all we
+   # need to know:
+ 
+   # see WIN32 case for an explanation of what this does:
+@@ -174,12 +174,12 @@ else() # not WIN32
+     set( ASSUAN_PTHREAD_FOUND false )
+     set( ASSUAN_PTH_FOUND     false )
+ 
+-    find_program( _ASSUANCONFIG_EXECUTABLE NAMES libassuan-config )
++    find_program( _ASSUANCONFIG_EXECUTABLE NAMES libassuan1-config )
+ 
+-    # if libassuan-config has been found
++    # if libassuan1-config has been found
+     if ( _ASSUANCONFIG_EXECUTABLE )
+       
+-      message( STATUS "Found libassuan-config at ${_ASSUANCONFIG_EXECUTABLE}" )
++      message( STATUS "Found libassuan1-config at ${_ASSUANCONFIG_EXECUTABLE}" )
+ 
+       exec_program( ${_ASSUANCONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE ASSUAN_VERSION )
+ 
diff --git a/kdepim.spec b/kdepim.spec
index 56ab37c..bd67648 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -5,7 +5,7 @@ Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.4.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -21,7 +21,12 @@ Patch0:  kdepim-4.4.0-install-headers.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=496988
 Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
 
-# upstream patches
+# allow build against libassuan1
+Patch2: kdepim-4.4.5-libassuan1.patch
+
+## upstreamable patches
+
+## upstream patches
 
 Obsoletes: bilbo < 1:1.0
 %if 0%{?fedora} < 13
@@ -47,7 +52,11 @@ BuildRequires: cyrus-sasl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gpgme-devel
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: libassuan-static, libassuan-devel
+%if 0%{?fedora} > 13
+BuildRequires: libassuan1-devel libassuan1-static
+%else
+BuildRequires: libassuan-devel libassuan-static
+%endif
 BuildRequires: libical-devel
 BuildRequires: libXpm-devel libXScrnSaver-devel
 # TODO: libmapi from http://www.openchange.org/
@@ -107,6 +116,10 @@ Obsoletes: kdepim-devel < 6:4.3.95-1
 %endif
 %patch1 -p0 -b .kmail-saveAttachments
 
+%if 0%{?fedora} > 13
+%patch2 -p1 -b .libassuan1
+%endif
+
 
 %build
 mkdir -p %{_target_platform}
@@ -228,6 +241,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 11 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.5-2
+- build against libassuan1 (f14+)
+
 * Tue Jun 29 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.5-1
 - 4.4.5