From 34963651cc3c861eb3fbe0c7e4760ff4216a16a1 Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Wed, 15 May 2013 12:43:30 +0200
Subject: [PATCH] new upstream release

---
 .gitignore                     |  2 ++
 libassuan-2.0.3-multilib.patch | 19 -------------------
 libassuan-2.1.0-multilib.patch | 28 ++++++++++++++++++++++++++++
 libassuan.spec                 | 15 ++++++---------
 sources                        |  4 ++--
 5 files changed, 38 insertions(+), 30 deletions(-)
 delete mode 100644 libassuan-2.0.3-multilib.patch
 create mode 100644 libassuan-2.1.0-multilib.patch

diff --git a/.gitignore b/.gitignore
index cc820d4..86392ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ libassuan-2.0.0.tar.bz2.sig
 /libassuan-2.0.1.tar.bz2.sig
 /libassuan-2.0.3.tar.bz2
 /libassuan-2.0.3.tar.bz2.sig
+/libassuan-2.1.0.tar.bz2
+/libassuan-2.1.0.tar.bz2.sig
diff --git a/libassuan-2.0.3-multilib.patch b/libassuan-2.0.3-multilib.patch
deleted file mode 100644
index 1735e65..0000000
--- a/libassuan-2.0.3-multilib.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up libassuan-2.0.3/src/libassuan-config.in.multilib libassuan-2.0.3/src/libassuan-config.in
---- libassuan-2.0.3/src/libassuan-config.in.multilib	2011-04-06 17:40:47.000000000 +0200
-+++ libassuan-2.0.3/src/libassuan-config.in	2012-12-03 12:14:17.397866418 +0100
-@@ -121,13 +121,7 @@ if test "$echo_cflags" = "yes"; then
- fi
- 
- if test "$echo_libs" = "yes"; then
--    if test "@libdir@" != "/usr/lib" ; then
--      libdirs="-L@libdir@"
--      for i in $lib $extralibs ; do
--	if test "$i" = "-L@libdir@" ; then
--	  libdirs=""
--	fi
--      done
--    fi
-+    # libdir is always standard and implicitly searched
-+    libdirs=""
-     echo $libdirs $lib $extralibs
- fi
diff --git a/libassuan-2.1.0-multilib.patch b/libassuan-2.1.0-multilib.patch
new file mode 100644
index 0000000..e0ad0d5
--- /dev/null
+++ b/libassuan-2.1.0-multilib.patch
@@ -0,0 +1,28 @@
+diff -up libassuan-2.1.0/src/libassuan-config.in.multilib libassuan-2.1.0/src/libassuan-config.in
+--- libassuan-2.1.0/src/libassuan-config.in.multilib	2013-05-15 12:41:33.376279564 +0200
++++ libassuan-2.1.0/src/libassuan-config.in	2013-05-15 12:40:11.565515616 +0200
+@@ -18,7 +18,7 @@ lib="@LIBASSUAN_CONFIG_LIB@"
+ extralibs="@LIBASSUAN_CONFIG_EXTRA_LIBS@ $gpg_error_libs"
+ cflags="@LIBASSUAN_CONFIG_CFLAGS@ $gpg_error_cflags"
+ api_version="@LIBASSUAN_CONFIG_API_VERSION@"
+-my_host="none"
++my_host="@LIBASSUAN_CONFIG_HOST@"
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ includes=""
+@@ -121,13 +121,7 @@ if test "$echo_cflags" = "yes"; then
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-    if test "@libdir@" != "/usr/lib" ; then
+-      libdirs="-L@libdir@"
+-      for i in $lib $extralibs ; do
+-	if test "$i" = "-L@libdir@" ; then
+-	  libdirs=""
+-	fi
+-      done
+-    fi
++    # libdir is always standard and implicitly searched
++    libdirs=""
+     echo $libdirs $lib $extralibs
+ fi
diff --git a/libassuan.spec b/libassuan.spec
index 473626d..f36a568 100644
--- a/libassuan.spec
+++ b/libassuan.spec
@@ -1,7 +1,7 @@
 Name:    libassuan
 Summary: GnuPG IPC library
-Version: 2.0.3
-Release: 5%{?dist}
+Version: 2.1.0
+Release: 1%{?dist}
 
 # The library is LGPLv2+, the documentation GPLv3+
 License: LGPLv2+ and GPLv3+
@@ -9,9 +9,8 @@ Source0: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{version}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 Group:   System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1:  libassuan-2.0.3-multilib.patch
+Patch1:  libassuan-2.1.0-multilib.patch
 
 BuildRequires: gawk
 BuildRequires: libgpg-error-devel >= 1.8
@@ -51,8 +50,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-
 make install DESTDIR=%{buildroot}
 
 ## Unpackaged files
@@ -77,9 +74,6 @@ if [ $1 -eq 0 ]; then
 fi
 
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING COPYING.LIB NEWS README THANKS TODO
@@ -95,6 +89,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed May 15 2013 Tomáš Mráz <tmraz@redhat.com> 2.1.0-1
+- new upstream release
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index f67408a..58839b5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-179d1918325fdb928c7bd90b8a514fc7  libassuan-2.0.3.tar.bz2
-720a92c3dd7586e8e49f747e821320e6  libassuan-2.0.3.tar.bz2.sig
+b3231eec8e567f4f9294474a387378f5  libassuan-2.1.0.tar.bz2
+324d3f2f60b9c43872df57c37860c790  libassuan-2.1.0.tar.bz2.sig