From bbfbd3740e0e58d61c47fb3b5de4da9b3d1fd867 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Fri, 8 Jan 2010 09:11:26 +0000
Subject: [PATCH] upgrading package: libassuan 1.0.5 -> 2.0.0

---
 libassuan/libassuan.patch | 21 ++++++++--
 libassuan/libassuan.spec  | 85 +++++++++++++++++++++++++++++----------
 2 files changed, 82 insertions(+), 24 deletions(-)

diff --git a/libassuan/libassuan.patch b/libassuan/libassuan.patch
index de6b990611..d2cbf7d441 100644
--- a/libassuan/libassuan.patch
+++ b/libassuan/libassuan.patch
@@ -1,6 +1,21 @@
-Index: src/libassuan-config.in
---- src/libassuan-config.in.orig	2006-10-09 12:41:47 +0200
-+++ src/libassuan-config.in	2006-11-15 20:25:37 +0100
+Index: libassuan-1.0.5/src/libassuan-config.in
+--- libassuan-1.0.5/src/libassuan-config.in.orig	2006-10-09 12:41:47 +0200
++++ libassuan-1.0.5/src/libassuan-config.in	2006-11-15 20:25:37 +0100
+@@ -105,6 +105,11 @@
+   esac
+   shift
+ done
++    
++if test "x${thread_module}" = "x-pth"; then
++    cflags="$cflags `$prefix/bin/pth-config --cflags`"
++    extralibs="$extralibs `$prefix/bin/pth-config --libs`"
++fi
+ 
+ if test "$echo_prefix" = "yes"; then
+     echo $prefix
+Index: libassuan-2.0.0/src/libassuan-config.in
+--- libassuan-2.0.0/src/libassuan-config.in.orig	2006-10-09 12:41:47 +0200
++++ libassuan-2.0.0/src/libassuan-config.in	2006-11-15 20:25:37 +0100
 @@ -105,6 +105,11 @@
    esac
    shift
diff --git a/libassuan/libassuan.spec b/libassuan/libassuan.spec
index 815d278da2..022770bdcd 100644
--- a/libassuan/libassuan.spec
+++ b/libassuan/libassuan.spec
@@ -21,6 +21,10 @@
 ##  SUCH DAMAGE.
 ##
 
+#   package version
+%define       V_assuan1  1.0.5
+%define       V_assuan2  2.0.0
+
 #   package information
 Name:         libassuan
 Summary:      GnuPG IPC Library
@@ -31,11 +35,12 @@ Distribution: OpenPKG Community
 Class:        PLUS
 Group:        Libraries
 License:      GPL/LGPL
-Version:      1.0.5
-Release:      20080526
+Version:      %{V_assuan2}
+Release:      20100108
 
 #   list of sources
-Source0:      ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{version}.tar.bz2
+Source0:      ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{V_assuan1}.tar.bz2
+Source1:      ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{V_assuan2}.tar.bz2
 Patch0:       libassuan.patch
 
 #   build information
@@ -43,8 +48,8 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20040130
 PreReq:       OpenPKG, openpkg >= 20040130
-BuildPreReq:  pth
-PreReq:       pth
+BuildPreReq:  pth, gpg-error
+PreReq:       pth, gpg-error
 AutoReq:      no
 AutoReqProv:  no
 
@@ -52,32 +57,70 @@ AutoReqProv:  no
     Libassuan is the IPC library used by some GnuPG related software.
 
 %track
-    prog libassuan = {
-        version   = %{version}
+    prog libassuan:libassuan1 = {
+        version   = %{V_assuan1}
+        url       = ftp://ftp.gnupg.org/gcrypt/libassuan/
+        regex     = libassuan-(1\.\d+\.\d+)\.tar\.bz2
+    }
+    prog libassuan:libassuan2 = {
+        version   = %{V_assuan2}
         url       = ftp://ftp.gnupg.org/gcrypt/libassuan/
-        regex     = libassuan-(__VER__)\.tar\.bz2
+        regex     = libassuan-(2\.\d+\.\d+)\.tar\.bz2
     }
 
 %prep
-    %setup -q
+    %setup -q -c
+    %setup -q -D -a 1
     %patch -p0
 
 %build
-    CC="%{l_cc}" \
-    CFLAGS="%{l_cflags -O}" \
-    CPPFLAGS="%{l_cppflags pth .}" \
-    LDFLAGS="%{l_ldflags}" \
-    ./configure \
-        --prefix=%{l_prefix} \
-        --infodir=%{l_prefix}/info \
-        --mandir=%{l_prefix}/man \
-        --with-pth-prefix=%{l_prefix} \
-        --disable-shared
-    %{l_make} %{l_mflags -O}
+    ( cd libassuan-%{V_assuan1}
+      CC="%{l_cc}" \
+      CFLAGS="%{l_cflags -O}" \
+      CPPFLAGS="%{l_cppflags pth .}" \
+      LDFLAGS="%{l_ldflags}" \
+      ./configure \
+          --prefix=%{l_prefix} \
+          --infodir=%{l_prefix}/info \
+          --mandir=%{l_prefix}/man \
+          --with-pth-prefix=%{l_prefix} \
+          --disable-shared
+      %{l_make} %{l_mflags -O}
+    ) || exit $?
+    ( cd libassuan-%{V_assuan2}
+      CC="%{l_cc}" \
+      CFLAGS="%{l_cflags -O}" \
+      CPPFLAGS="%{l_cppflags pth .}" \
+      LDFLAGS="%{l_ldflags}" \
+      ./configure \
+          --prefix=%{l_prefix} \
+          --infodir=%{l_prefix}/info \
+          --mandir=%{l_prefix}/man \
+          --with-pth-prefix=%{l_prefix} \
+          --disable-shared
+      %{l_make} %{l_mflags -O}
+    ) || exit $?
 
 %install
     rm -rf $RPM_BUILD_ROOT
-    %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+    ( cd libassuan-%{V_assuan2}
+      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+      mv  $RPM_BUILD_ROOT%{l_prefix}/bin/libassuan-config \
+          $RPM_BUILD_ROOT%{l_prefix}/bin/libassuan2-config
+      mv  $RPM_BUILD_ROOT%{l_prefix}/include/assuan.h \
+          $RPM_BUILD_ROOT%{l_prefix}/include/assuan2.h
+      mv  $RPM_BUILD_ROOT%{l_prefix}/info/assuan.info \
+          $RPM_BUILD_ROOT%{l_prefix}/info/assuan2.info
+      mv  $RPM_BUILD_ROOT%{l_prefix}/lib/libassuan.a \
+          $RPM_BUILD_ROOT%{l_prefix}/lib/libassuan2.a
+      mv  $RPM_BUILD_ROOT%{l_prefix}/lib/libassuan.la \
+          $RPM_BUILD_ROOT%{l_prefix}/lib/libassuan2.la
+      mv  $RPM_BUILD_ROOT%{l_prefix}/share/aclocal/libassuan.m4 \
+          $RPM_BUILD_ROOT%{l_prefix}/share/aclocal/libassuan2.m4
+    ) || exit $?
+    ( cd libassuan-%{V_assuan1}
+      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+    ) || exit $?
     rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}