[gpa] - gpa-0.9.0 - make buildable against libassuan1 (f14+)

[Rex Dieter]

commit 58a26352721819df2613ce7f43f60b22d1d5c489
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Aug 11 13:15:32 2010 -0500

    - gpa-0.9.0
    - make buildable against libassuan1 (f14+)

 .gitignore                 |    2 ++
 gpa-0.9.0-libassuan1.patch |   12 ++++++++++++
 gpa.spec                   |   27 ++++++++++++++++++++++-----
 sources                    |    4 ++--
 4 files changed, 38 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4e53714..f67cbcd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 gpa-0.8.0.tar.bz2
 gpa-0.8.0.tar.bz2.sig
+gpa-0.9.0.tar.bz2
+gpa-0.9.0.tar.bz2.sig
diff --git a/gpa-0.9.0-libassuan1.patch b/gpa-0.9.0-libassuan1.patch
new file mode 100644
index 0000000..019e02a
--- /dev/null
+++ b/gpa-0.9.0-libassuan1.patch
@@ -0,0 +1,12 @@
+diff -up gpa-0.9.0/aclocal.m4.libassuan1 gpa-0.9.0/aclocal.m4
+--- gpa-0.9.0/aclocal.m4.libassuan1	2009-06-19 17:06:49.000000000 -0500
++++ gpa-0.9.0/aclocal.m4	2010-08-10 18:20:19.017356016 -0500
+@@ -1165,7 +1165,7 @@ m4_include([m4/isc-posix.m4])
+ m4_include([m4/lib-ld.m4])
+ m4_include([m4/lib-link.m4])
+ m4_include([m4/lib-prefix.m4])
+-m4_include([m4/libassuan.m4])
++m4_include([libassuan1.m4])
+ m4_include([m4/nls.m4])
+ m4_include([m4/po.m4])
+ m4_include([m4/progtest.m4])
diff --git a/gpa.spec b/gpa.spec
index 6c5ecc4..332945c 100644
--- a/gpa.spec
+++ b/gpa.spec
@@ -1,25 +1,31 @@
 
 Name:	 gpa
 Summary: Graphical user interface for GnuPG
-Version: 0.8.0
-Release: 3%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
 
 License: GPLv2+
 Group:   Applications/System
 URL:	 http://gpa.wald.intevation.org/
-Source0: http://wald.intevation.org/frs/download.php/491/gpa-%{version}.tar.bz2
-Source1: http://wald.intevation.org/frs/download.php/492/gpa-%{version}.tar.bz2.sig
+Source0: http://wald.intevation.org/frs/download.php/603/gpa-%{version}.tar.bz2
+Source1: http://wald.intevation.org/frs/download.php/604/gpa-%{version}.tar.bz2.sig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:   gpa-0.7.3-keyservers.patch
 Patch2:   gpa-0.7.6-desktop.patch
+Patch3:   gpa-0.9.0-libassuan1.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: gnupg
 BuildRequires: gpgme-devel
 BuildRequires: gtk2-devel
-BuildRequires: libassuan-static, libassuan-devel
+%if 0%{?fedora} > 13
+BuildRequires: automake
+BuildRequires: libassuan1-devel libassuan1-static
+%else
+BuildRequires: libassuan-devel libassuan-static
+%endif
 BuildRequires: zlib-devel
 
 %description
@@ -35,6 +41,13 @@ files, to verify signatures and to manage the private and public keys.
 #patch1 -p1 -b .keyservers
 %patch2 -p1 -b .dt
 
+%if 0%{?fedora} > 13
+%patch3 -p1 -b .libassuan1
+rm -f m4/libassuan.m4
+
+./autogen.sh
+%endif
+
 
 %build
 %configure
@@ -84,6 +97,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Tue Aug 10 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.9.0-1
+- gpa-0.9.0
+- make buildable against libassuan1 (f14+)
+
 * Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.0-3
 - Explicitly BR libassuan-static in accordance with the Packaging
   Guidelines (libassuan-devel is still static-only).
diff --git a/sources b/sources
index 034fe83..c1bf533 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-dea947a81d40927ee30def3c51e9a56b  gpa-0.8.0.tar.bz2
-9324aea2075728437d51ba5437167dd8  gpa-0.8.0.tar.bz2.sig
+8859f9cf69e94e10e4895f633a0b268a  gpa-0.9.0.tar.bz2
+2ee5662e2c4696c0bcf123e9a41a8d63  gpa-0.9.0.tar.bz2.sig