diff --git a/.gitignore b/.gitignore index ee85ad7..d76f663 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ gpgme-1.2.0.tar.bz2 gpgme-1.2.0.tar.bz2.sig +/gpgme-1.3.0.tar.bz2.sig +/gpgme-1.3.0.tar.bz2 diff --git a/gpgme-1.2.0-ImplicitDSOLinking.patch b/gpgme-1.2.0-ImplicitDSOLinking.patch deleted file mode 100644 index f4b271b..0000000 --- a/gpgme-1.2.0-ImplicitDSOLinking.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up gpgme-1.2.0/tests/gpgsm/Makefile.am.ImplicitDSOLinking gpgme-1.2.0/tests/gpgsm/Makefile.am ---- gpgme-1.2.0/tests/gpgsm/Makefile.am.ImplicitDSOLinking 2008-12-03 07:39:48.000000000 -0600 -+++ gpgme-1.2.0/tests/gpgsm/Makefile.am 2010-07-02 18:51:30.336705172 -0500 -@@ -32,7 +32,7 @@ EXTRA_DIST = cert_dfn_pca01.der cert_dfn - INCLUDES = -I$(top_builddir)/src - - AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ --LDADD = ../../src/libgpgme.la -+LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@ - - # We don't run t-genkey in the test suite, because it takes too long - # and needs a working pinentry. -diff -up gpgme-1.2.0/tests/gpgsm/Makefile.in.ImplicitDSOLinking gpgme-1.2.0/tests/gpgsm/Makefile.in ---- gpgme-1.2.0/tests/gpgsm/Makefile.in.ImplicitDSOLinking 2009-06-18 11:13:41.000000000 -0500 -+++ gpgme-1.2.0/tests/gpgsm/Makefile.in 2010-07-02 18:51:30.336705172 -0500 -@@ -285,7 +285,7 @@ EXTRA_DIST = cert_dfn_pca01.der cert_dfn - - INCLUDES = -I$(top_builddir)/src - AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ --LDADD = ../../src/libgpgme.la -+LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@ - key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939 - DISTCLEANFILES = pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \ - private-keys-v1.d/$(key_id).key random_seed -diff -up gpgme-1.2.0/tests/opassuan/Makefile.am.ImplicitDSOLinking gpgme-1.2.0/tests/opassuan/Makefile.am ---- gpgme-1.2.0/tests/opassuan/Makefile.am.ImplicitDSOLinking 2009-01-26 08:15:26.000000000 -0600 -+++ gpgme-1.2.0/tests/opassuan/Makefile.am 2010-07-02 18:53:28.451456311 -0500 -@@ -27,7 +27,7 @@ EXTRA_DIST = - INCLUDES = -I$(top_builddir)/src - - AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ --LDADD = ../../src/libgpgme.la -+LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@ - - noinst_PROGRAMS = $(TESTS) t-command - -diff -up gpgme-1.2.0/tests/opassuan/Makefile.in.ImplicitDSOLinking gpgme-1.2.0/tests/opassuan/Makefile.in ---- gpgme-1.2.0/tests/opassuan/Makefile.in.ImplicitDSOLinking 2009-06-18 11:13:41.000000000 -0500 -+++ gpgme-1.2.0/tests/opassuan/Makefile.in 2010-07-02 18:53:41.590456782 -0500 -@@ -236,7 +236,7 @@ noinst_HEADERS = - EXTRA_DIST = - INCLUDES = -I$(top_builddir)/src - AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ --LDADD = ../../src/libgpgme.la -+LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@ - DISTCLEANFILES = - all: all-am - diff --git a/gpgme.spec b/gpgme.spec index 5f364c1..83110e4 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -1,8 +1,8 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API -Version: 1.2.0 -Release: 4%{?dist} +Version: 1.3.0 +Release: 1%{?dist} License: LGPLv2+ Group: Applications/System @@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: gpgme-1.1.8-config_extras.patch # fix ImplicitDSOLinking in tests/, upstreamable -Patch2: gpgme-1.2.0-ImplicitDSOLinking.patch +Patch2: gpgme-1.3.0-ImplicitDSOLinking.patch # add -D_FILE_OFFSET_BITS... to gpgme-config, upstreamable Patch3: gpgme-1.2.0-largefile.patch @@ -24,6 +24,7 @@ BuildRequires: gnupg2 BuildRequires: gnupg2-smime BuildRequires: libgpg-error-devel BuildRequires: pth-devel +BuildRequires: libassuan-devel # --disable-gpg-test required since 'make check' currently includes some # gpg(1)-specific tests @@ -120,6 +121,9 @@ fi %changelog +* Fri Feb 11 2011 Tomas Mraz - 1.3.0-1 +- new upstream version + * Tue Feb 08 2011 Fedora Release Engineering - 1.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 6770587..220d4ea 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -508ee686bd275d908d1dc1938810e045 gpgme-1.2.0.tar.bz2 -ead07c74f6b82fe77ca632c69897c562 gpgme-1.2.0.tar.bz2.sig +417b83ac578213de8a3300b8215866ba gpgme-1.3.0.tar.bz2.sig +4784e3c6086c9c25e9a1b4d9f7c5aa96 gpgme-1.3.0.tar.bz2