diff --git a/.cvsignore b/.cvsignore index 6d0a0c1..aeab7b9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,2 @@ -libksba-1.0.1.tar.bz2.sig -libksba-1.0.1.tar.bz2 -libksba-1.0.2.tar.bz2 -libksba-1.0.2.tar.bz2.sig +libksba-1.0.5.tar.bz2 +libksba-1.0.5.tar.bz2.sig diff --git a/libksba-1.0.3-multilib.patch b/libksba-1.0.3-multilib.patch new file mode 100644 index 0000000..525fb90 --- /dev/null +++ b/libksba-1.0.3-multilib.patch @@ -0,0 +1,13 @@ +diff -up libksba-1.0.3/src/ksba-config.in.multilib libksba-1.0.3/src/ksba-config.in +--- libksba-1.0.3/src/ksba-config.in.multilib 2006-08-31 03:05:24.000000000 -0500 ++++ libksba-1.0.3/src/ksba-config.in 2008-04-03 11:21:11.000000000 -0500 +@@ -116,9 +116,6 @@ fi + + if test "$echo_libs" = "yes"; then + libdirs="" +- if test "@libdir@" != "/usr/lib" ; then +- libdirs="-L@libdir@" +- fi + tmp="" + for i in $libdirs $libs; do + if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then diff --git a/libksba.spec b/libksba.spec index d147471..ea4a6dd 100644 --- a/libksba.spec +++ b/libksba.spec @@ -1,8 +1,8 @@ Summary: X.509 library Name: libksba -Version: 1.0.2 -Release: 3%{?dist} +Version: 1.0.5 +Release: 1%{?dist} License: GPLv3 Group: System Environment/Libraries @@ -11,7 +11,11 @@ Source0: ftp://ftp.gnupg.org/gcrypt/libksba/libksba-%{version}.tar.bz2 Source1: ftp://ftp.gnupg.org/gcrypt/libksba/libksba-%{version}.tar.bz2.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# quick-n-dirty hack to ksba-config, TODO: consider using pkgconfig instead +Patch1: libksba-1.0.3-multilib.patch + BuildRequires: gawk +# >= 1.4 preferred BuildRequires: libgpg-error-devel >= 1.2 BuildRequires: libgcrypt-devel >= 1.2.0 @@ -32,6 +36,8 @@ Requires(preun): /sbin/install-info %prep %setup -q +%patch1 -p1 -b .multilib + %build %configure \ @@ -74,18 +80,33 @@ fi %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README* THANKS TODO VERSION -%{_libdir}/lib*.so.* +%{_libdir}/libksba.so.8* %files devel %defattr(-,root,root,-) %{_bindir}/ksba-config -%{_libdir}/lib*.so +%{_libdir}/libksba.so %{_includedir}/* %{_datadir}/aclocal/* %{_infodir}/* %changelog +* Fri Jan 09 2009 Rex Dieter 1.0.5-1 +- libksba-1.0.5 + +* Thu Sep 23 2008 Rex Dieter 1.0.4-1 +- libksba-1.0.4 + +* Thu Apr 03 2008 Rex Dieter 1.0.3-2 +- multiarch conflicts (#342201) + +* Tue Feb 12 2008 Rex Dieter 1.0.3-1 +- libksba-1.0.3 + +* Fri Feb 08 2008 Rex Dieter 1.0.2-4 +- respin (gcc43) + * Sat Aug 25 2007 Rex Dieter 1.0.2-3 - BR: gawk diff --git a/sources b/sources index 0d3f495..116c551 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -3cccb3ef697e1e69eeceeea0715ff220 libksba-1.0.2.tar.bz2 -a1d7d484036c3a74056a5e6638713b13 libksba-1.0.2.tar.bz2.sig +6948a3d96679b5afd504a1f91170b18b libksba-1.0.5.tar.bz2 +1d94de3b0e8896fad19549d4addf1124 libksba-1.0.5.tar.bz2.sig