From e3b75f3a52ae5efadd08761683d0a207c1383d8d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mar 05 2007 20:42:49 +0000 Subject: - gpgme-1.1.4 --- diff --git a/.cvsignore b/.cvsignore index c39d33e..7fbbcce 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,5 @@ -gpgme-1.1.2.tar.bz2 -gpgme-1.1.2.tar.bz2.sig +clog +gpgme-1.1.3.tar.bz2 +gpgme-1.1.3.tar.bz2.sig +gpgme-1.1.4.tar.bz2 +gpgme-1.1.4.tar.bz2.sig diff --git a/gpgme-1.1.2-config_extras.patch b/gpgme-1.1.2-config_extras.patch deleted file mode 100644 index f6d26c2..0000000 --- a/gpgme-1.1.2-config_extras.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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-09-18 14:12:04.000000000 -0500 -@@ -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-1.1.3-config_extras.patch b/gpgme-1.1.3-config_extras.patch new file mode 100644 index 0000000..c689cc2 --- /dev/null +++ b/gpgme-1.1.3-config_extras.patch @@ -0,0 +1,28 @@ +--- gpgme-1.1.3/gpgme/gpgme-config.in.config_extras 2007-01-29 14:16:20.000000000 -0600 ++++ gpgme-1.1.3/gpgme/gpgme-config.in 2007-02-03 14:57:01.000000000 -0600 +@@ -19,21 +19,21 @@ + + # 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="-lpthread" ++#libs_pthread="-lpthread" + cflags_pthread="" + + # Configure glib. +-libs_glib="@GLIB_LIBS@" ++#libs_glib="@GLIB_LIBS@" + cflags_glib="@GLIB_CFLAGS@" + with_glib= + diff --git a/gpgme.spec b/gpgme.spec index 08a7f06..4e22567 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -1,8 +1,8 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API -Version: 1.1.2 -Release: 6%{?dist}.1 +Version: 1.1.4 +Release: 1%{?dist} License: LGPL Group: Applications/System @@ -11,19 +11,20 @@ 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 +Patch1: gpgme-1.1.3-config_extras.patch -BuildRequires: gnupg >= 1.2.2 -BuildRequires: gnupg2 >= 1.9.6 -BuildRequires: libgpg-error-devel >= 0.5 -BuildRequires: pth-devel >= 2.0.4 +BuildRequires: gnupg +BuildRequires: gnupg2 +BuildRequires: libgpg-error-devel +BuildRequires: pth-devel # Not really used, only for win32 build #BuildRequires: glib2-devel -Requires: gnupg >= 1.2.2 -Requires: gnupg2 >= 1.9.6 +Requires: gnupg +Requires: gnupg2 -Obsoletes: cryptplug <= 0.3.16-2 +# Hasn't existed for a *long* time. +#Obsoletes: cryptplug <= 0.3.16-2 %description GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG @@ -60,8 +61,10 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +# unpackaged files rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -rf $RPM_BUILD_ROOT%{_datadir}/common-lisp/source/gpgme/ %check || : @@ -86,6 +89,7 @@ if [ $1 -eq 0 ] ; then fi + %files %defattr(-,root,root,-) %doc AUTHORS COPYING* ChangeLog NEWS README* THANKS TODO VERSION @@ -100,7 +104,15 @@ fi %{_infodir}/gpgme.info* + + %changelog +* Mon Mar 05 2007 Rex Dieter 1.1.4-1 +- gpgme-1.1.4 + +* Sat Feb 03 2007 Rex Dieter 1.1.3-1 +- gpgme-1.1.3 + * Tue Oct 03 2006 Rex Dieter - respin diff --git a/sources b/sources index 590b4a6..66d48cb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -7c2333679035a5f37e99630a156a40ca gpgme-1.1.2.tar.bz2 -5b786d78d322ea0778eea5ae67c087b4 gpgme-1.1.2.tar.bz2.sig +3b133a3703f16835e55d1a2f8cfdfa70 gpgme-1.1.4.tar.bz2 +4faf6a954723e7960487c741596e4f12 gpgme-1.1.4.tar.bz2.sig