From 1c669d3455f79d8560900e758dddd7058f5de5b1 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@fedoraproject.org>
Date: Thu, 25 Feb 2010 19:27:02 +0000
Subject: [PATCH] - turn off common lisp bindings the right way - drop finger
 output - recode the changelog into UTF-8 if it isn't UTF-8 (rpmlint)

---
 libgpg-error.spec | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/libgpg-error.spec b/libgpg-error.spec
index d5771eb..ac46356 100644
--- a/libgpg-error.spec
+++ b/libgpg-error.spec
@@ -1,14 +1,14 @@
 Summary: Library for error values used by GnuPG components
 Name: libgpg-error
 Version: 1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: ftp://ftp.gnupg.org/gcrypt/libgpg-error/
 Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2.sig
 Group: System Environment/Libraries
 License: LGPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gawk, gettext, libtool
+BuildRequires: gawk, gettext, autoconf, automake, libtool
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -34,20 +34,26 @@ contains files necessary to develop applications using libgpg-error.
 # set it to a value which we know will be suppressed.
 sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g' src/gpg-error-config.in
 # Recode the changelog into UTF-8 to meet packaging guidelines.
-iconv ChangeLog -f UTF-8 -t UTF-8 ChangeLog > /dev/null || \
+iconv -f UTF-8 -t UTF-8 ChangeLog > /dev/null || \
 ( mv ChangeLog ChangeLog.iso-8859-15 && \
   iconv -f ISO-8859-15 -t UTF-8 ChangeLog.iso-8859-15 > ChangeLog &&
   touch -r ChangeLog.iso-8859-15 ChangeLog )
+# We need a version of libtool that won't decide to add an rpath of /usr/lib64
+# even when we ask it not to.
+libtoolize -f -c
+aclocal
+automake
+autoheader
+autoconf
 
 %build
-%configure --disable-static --disable-rpath
-make %{?_smp_mflags} LIBTOOL=libtool
+%configure --disable-static --disable-rpath --disable-languages
+make %{?_smp_mflags}
 
 %install
 rm -fr $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/common-lisp
 
 %find_lang %{name}
 
@@ -102,6 +108,11 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/aclocal/gpg-error.m4
 
 %changelog
+* Thu Feb 25 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7-3
+- turn off common lisp bindings the right way
+- drop finger output
+- recode the changelog into UTF-8 if it isn't UTF-8 (rpmlint)
+
 * Mon Jan 11 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7-2
 - fix use of macro in changelog (rpmlint)
 - build with --disable-rpath (rpmlint)