From 7bf5d69355a79c77fd209205413ee761585c421c Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: May 10 2005 16:04:32 +0000
Subject: Merge upgrade package changes from Rex.


---

diff --git a/.cvsignore b/.cvsignore
index eafc62a..400c1b0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libksba-0.9.9.tar.gz
+libksba-0.9.11.tar.gz
diff --git a/libksba-0.9.11.tar.gz.sig b/libksba-0.9.11.tar.gz.sig
new file mode 100644
index 0000000..0b12928
Binary files /dev/null and b/libksba-0.9.11.tar.gz.sig differ
diff --git a/libksba-0.9.9-underquoted.patch b/libksba-0.9.9-underquoted.patch
deleted file mode 100644
index 65255bf..0000000
--- a/libksba-0.9.9-underquoted.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur libksba-0.9.9-orig/src/ksba.m4 libksba-0.9.9/src/ksba.m4
---- libksba-0.9.9-orig/src/ksba.m4	2002-08-23 20:53:24.000000000 +0200
-+++ libksba-0.9.9/src/ksba.m4	2005-02-01 20:15:20.041030328 +0100
-@@ -14,7 +14,7 @@
- dnl              [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
- dnl Test for libksba and define KSBA_CFLAGS and KSBA_LIBS
- dnl
--AC_DEFUN(AM_PATH_KSBA,
-+AC_DEFUN([AM_PATH_KSBA],
- [ AC_ARG_WITH(ksba-prefix,
-             AC_HELP_STRING([--with-ksba-prefix=PFX],
-                            [prefix where KSBA is installed (optional)]),
diff --git a/libksba-0.9.9.tar.gz.sig b/libksba-0.9.9.tar.gz.sig
deleted file mode 100644
index 1c11655..0000000
Binary files a/libksba-0.9.9.tar.gz.sig and /dev/null differ
diff --git a/libksba.spec b/libksba.spec
index 8ac47fd..94edb99 100644
--- a/libksba.spec
+++ b/libksba.spec
@@ -1,15 +1,13 @@
 Summary: X.509 library
 Name:    libksba
-Version: 0.9.9
-Release: 2%{?dist_tag}
-
+Version: 0.9.11
+Release: 1%{?dist}
 License: GPL
 Group:   System Environment/Libraries
 URL:     http://www.gnupg.org/
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-0.9.9.tar.gz
-Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-0.9.9.tar.gz.sig
-Patch0:  libksba-0.9.9-underquoted.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-%{version}.tar.gz
+Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-%{version}.tar.gz.sig
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libgpg-error >= 0.7
 BuildRequires: libgcrypt-devel >= 1.2.0
@@ -30,7 +28,6 @@ Development headers and libraries for %{name}.
 
 %prep
 %setup -q
-%patch -p1 -b .underquoted
 
 
 %build
@@ -39,6 +36,8 @@ Development headers and libraries for %{name}.
 # not smp safe
 make
 
+
+%check || :
 make check
 
 
@@ -58,11 +57,11 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %post devel
-install-info %{_infodir}/ksba.info.gz %{_infodir}/dir ||:
+install-info %{_infodir}/ksba.info %{_infodir}/dir ||:
 
 %postun devel
 if [ $1 -eq 0 ]; then
-  install-info --delete %{_infodir}/ksba.info.gz %{_infodir}/dir ||:
+  install-info --delete %{_infodir}/ksba.info %{_infodir}/dir ||:
 fi
 
 
@@ -74,20 +73,28 @@ fi
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{_libdir}/*.a
-%{_libdir}/*.so
+%{_libdir}/lib*.a
+%{_libdir}/lib*.so
 %{_includedir}/*
 %{_datadir}/aclocal/*
 %{_infodir}/*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Apr 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.11-1
+- 0.9.11
+- drop upstreamed acquote patch
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.9-2
 - rebuilt
 
 * Tue Feb  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:0.9.9-1
 - Minus BR libtool, add epoch to -devel req, fix underquoted ksba.m4.
 
+* Fri Oct 22 2004 Rex Dieter <rexdieter[AT]users.sf.net> 0:0.9.9-0.fdr.2
+- remove hard-coded .gz from %%post/%%postun
+- add %%check section
+
 * Tue Oct 19 2004 Rex Dieter <rexdieter[AT]users.sf.net> 0:0.9.9-0.fdr.1
 - 0.9.9
 
diff --git a/sources b/sources
index d525395..144e880 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-49085f4435e7506c790ae23342b01b37  libksba-0.9.9.tar.gz
+f21912398467e0c93ae1abeb8f6b3a3d  libksba-0.9.11.tar.gz