From 2edc7b7573c0808ed90d5c38fcfcec4d06ec75fe Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Sun, 17 Jan 2010 17:03:20 +0000
Subject: [PATCH] use new version 2 libassuan

---
 pwmd/pwmd.patch | 24 ------------------------
 pwmd/pwmd.spec  |  3 ---
 2 files changed, 27 deletions(-)

diff --git a/pwmd/pwmd.patch b/pwmd/pwmd.patch
index ef9febcd07..640aa37863 100644
--- a/pwmd/pwmd.patch
+++ b/pwmd/pwmd.patch
@@ -35,27 +35,3 @@ Index: pwmd-2.3/src/Makefile.am
  	       @PTH_LDFLAGS@ @PTH_LIBS@ @LIBASSUAN_LIBS@
  pwmd_CFLAGS = -DLOCALEDIR=\"${prefix}/share/locale\" @XML_CPPFLAGS@ \
  	      @GLIB_CFLAGS@ @LIBGCRYPT_CFLAGS@ @GPG_ERROR_CFLAGS@ \
-Index: pwmd-2.3/src/common.h
---- pwmd-2.3/src/common.h.orig	2010-01-17 14:28:00 +0100
-+++ pwmd-2.3/src/common.h	2010-01-17 17:44:57 +0100
-@@ -23,7 +23,7 @@
- #include <sys/stat.h>
- #include <pth.h>
- #include <gcrypt.h>
--#include <assuan.h>
-+#include <assuan2.h>
- 
- #ifdef ENABLE_NLS
- #ifdef HAVE_LOCALE_H
-Index: pwmd-2.3/src/status.h
---- pwmd-2.3/src/status.h.orig	2010-01-17 14:28:00 +0100
-+++ pwmd-2.3/src/status.h	2010-01-17 17:45:06 +0100
-@@ -20,7 +20,7 @@
- #define STATUS_H
- 
- #include <gpg-error.h>
--#include <assuan.h>
-+#include <assuan2.h>
- 
- #define DEFAULT_KEEPALIVE_TO	30
- 
diff --git a/pwmd/pwmd.spec b/pwmd/pwmd.spec
index af8f9b5a9d..c669281bd4 100644
--- a/pwmd/pwmd.spec
+++ b/pwmd/pwmd.spec
@@ -86,9 +86,6 @@ AutoReqProv:  no
       aclocal
       automake
       autoconf
-      %{l_shtool} subst \
-          -e 's;bin/libassuan-config;bin/libassuan2-config;g' \
-          configure
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
       CPPFLAGS="%{l_cppflags}" \