From f2ebab7f7247911e34d742328710a88343abb819 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: May 11 2006 19:34:16 +0000 Subject: - add back support for gpgme-config --thread=pthread --- diff --git a/gpgme-1.1.2-config_extras.patch b/gpgme-1.1.2-config_extras.patch new file mode 100644 index 0000000..36e9010 --- /dev/null +++ b/gpgme-1.1.2-config_extras.patch @@ -0,0 +1,24 @@ +--- gpgme-1.1.2/gpgme/gpgme-config.in.config_extras 2005-11-18 17:03:28.000000000 -0600 ++++ gpgme-1.1.2/gpgme/gpgme-config.in 2006-03-06 08:50:57.000000000 -0600 +@@ -16,15 +16,19 @@ + + # Configure libgpg-error. + gpg_error_cflags="@GPG_ERROR_CFLAGS@" +-gpg_error_libs="@GPG_ERROR_LIBS@" ++#gpg_error_libs="@GPG_ERROR_LIBS@" + + # Configure thread packages. + thread_modules="" + + @HAVE_PTH_TRUE@thread_modules="$thread_modules pth" +-libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@" ++#libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@" + cflags_pth="@PTH_CFLAGS@" + ++@HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread" ++#libs_pthread="@PTHREAD_LDFLAGS@ @PTHREAD_LIBS@" ++cflags_pthread="@PTHREAD_CFLAGS@" ++ + # Configure glib. + libs_glib="@GLIB_LIBS@" + cflags_glib="@GLIB_CFLAGS@" diff --git a/gpgme.spec b/gpgme.spec index 074d636..edf4f09 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -2,7 +2,7 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API Version: 1.1.2 -Release: 1%{?dist} +Release: 3%{?dist} License: LGPL Group: Applications/System @@ -11,6 +11,8 @@ Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2 Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: gpgme-1.1.2-config_extras.patch + BuildRequires: gnupg >= 1.2.2 BuildRequires: gnupg2 >= 1.9.6 BuildRequires: libgpg-error-devel >= 0.5 @@ -41,6 +43,8 @@ Requires(postun): /sbin/install-info %prep %setup -q +%patch1 -p1 -b .config_extras + %build %configure \ @@ -95,6 +99,12 @@ fi %changelog +* Mon Mar 6 2006 Rex Dieter 1.1.2-3 +- add back support for gpgme-config --thread=pthread + +* Mon Mar 6 2006 Rex Dieter 1.1.2-2 +- drop extraneous libs from gpgme-config + * Fri Mar 3 2006 Rex Dieter 1.1.2-1 - 1.1.2 - drop upstreamed gpgme-1.1.0-tests.patch