diff --git a/.cvsignore b/.cvsignore
index eeb666d..ee85ad7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-gpgme-1.1.8.tar.bz2
-gpgme-1.1.8.tar.bz2.sig
+gpgme-1.2.0.tar.bz2
+gpgme-1.2.0.tar.bz2.sig
diff --git a/gpgme-1.1.8-ImplicitDSOLinking.patch b/gpgme-1.1.8-ImplicitDSOLinking.patch
deleted file mode 100644
index 0cb6a81..0000000
--- a/gpgme-1.1.8-ImplicitDSOLinking.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up gpgme-1.1.8/tests/gpgsm/Makefile.am.ImplicitDSOLinking gpgme-1.1.8/tests/gpgsm/Makefile.am
---- gpgme-1.1.8/tests/gpgsm/Makefile.am.ImplicitDSOLinking	2008-12-03 07:39:48.000000000 -0600
-+++ gpgme-1.1.8/tests/gpgsm/Makefile.am	2010-02-14 14:59:43.567369732 -0600
-@@ -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.1.8/tests/gpgsm/Makefile.in.ImplicitDSOLinking gpgme-1.1.8/tests/gpgsm/Makefile.in
---- gpgme-1.1.8/tests/gpgsm/Makefile.in.ImplicitDSOLinking	2008-12-08 12:41:52.000000000 -0600
-+++ gpgme-1.1.8/tests/gpgsm/Makefile.in	2010-02-14 15:01:18.270368592 -0600
-@@ -283,7 +283,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.1.8/tests/Makefile.am.ImplicitDSOLinking gpgme-1.1.8/tests/Makefile.am
-diff -up gpgme-1.1.8/tests/Makefile.in.ImplicitDSOLinking gpgme-1.1.8/tests/Makefile.in
diff --git a/gpgme-1.2.0-ImplicitDSOLinking.patch b/gpgme-1.2.0-ImplicitDSOLinking.patch
new file mode 100644
index 0000000..f4b271b
--- /dev/null
+++ b/gpgme-1.2.0-ImplicitDSOLinking.patch
@@ -0,0 +1,48 @@
+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 bf86204..609d702 100644
--- a/gpgme.spec
+++ b/gpgme.spec
@@ -1,8 +1,8 @@
 
 Name:    gpgme
 Summary: GnuPG Made Easy - high level crypto API
-Version: 1.1.8
-Release: 4%{?dist}
+Version: 1.2.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.1.8-ImplicitDSOLinking.patch
+Patch2:  gpgme-1.2.0-ImplicitDSOLinking.patch
 
 BuildRequires: gawk
 BuildRequires: gnupg2
@@ -116,6 +116,9 @@ fi
 
 
 %changelog
+* Fri Jul 02 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.2.0-1
+- gpgme-1.2.0 (#610984)
+
 * Sun Feb 14 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.1.8-4
 - FTBFS gpgme-1.1.8-3.fc13: ImplicitDSOLinking (#564605)
 
diff --git a/sources b/sources
index 8531bea..6770587 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-39bd929d5f3dc6d3d91cf465ec91b4af  gpgme-1.1.8.tar.bz2
-2467c8ed6e1c6b7c9d70542ec80f96bc  gpgme-1.1.8.tar.bz2.sig
+508ee686bd275d908d1dc1938810e045  gpgme-1.2.0.tar.bz2
+ead07c74f6b82fe77ca632c69897c562  gpgme-1.2.0.tar.bz2.sig