[gnomint] Fix misapplication of libgcrypt patch (#1106691)

[Yaakov Selkowitz]

commit 3e72a529b34f405837afaf026204f5b3410f8c6c
Author: Yaakov Selkowitz <yselkowi at redhat.com>
Date:   Mon Sep 8 03:01:49 2014 -0500

    Fix misapplication of libgcrypt patch (#1106691)

 gnomint-1.2.1-DSO-libgcrypt.patch        |   21 ++++++++++-----------
 gnomint-1.2.1-autoreconf-libgcrypt.patch |   26 --------------------------
 gnomint.spec                             |    7 ++++---
 3 files changed, 14 insertions(+), 40 deletions(-)
---
diff --git a/gnomint-1.2.1-DSO-libgcrypt.patch b/gnomint-1.2.1-DSO-libgcrypt.patch
index 730f5f6..776456f 100644
--- a/gnomint-1.2.1-DSO-libgcrypt.patch
+++ b/gnomint-1.2.1-DSO-libgcrypt.patch
@@ -1,11 +1,10 @@
---- a/src/Makefile.in	2010-08-11 10:12:26.000000000 +0100
-+++ b/src/Makefile.in	2010-08-27 10:22:56.794524100 +0100
-@@ -98,7 +98,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+	$(AM_LDFLAGS) $(LDFLAGS) $(LIBGCRYPT_LIBS) -o $@
- SOURCES = $(gnomint_SOURCES) $(gnomint_cli_SOURCES)
- DIST_SOURCES = $(gnomint_SOURCES) $(gnomint_cli_SOURCES)
- ETAGS = etags
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -81,6 +81,7 @@ gnomint_cli_SOURCES = \
+ 
+ gnomint_cli_LDADD = \
+ 	$(GNOMINTCLI_LIBS) \
++        $(LIBGCRYPT_LIBS) \
+ 	$(LIBGNUTLS_LIBS) \
+ 	$(SQLITE_LIBS) \
+ 	$(READLINE_LIBS) \
diff --git a/gnomint.spec b/gnomint.spec
index a49220a..f1ad314 100644
--- a/gnomint.spec
+++ b/gnomint.spec
@@ -1,6 +1,6 @@
 Name:		gnomint
 Version:	1.2.1
-Release:	124%{?dist}
+Release:	125%{?dist}
 Summary:	Graphical x509 Certification Authority management tool
 
 Group:		Applications/System
@@ -9,7 +9,6 @@ URL:		http://gnomint.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:		%{name}-%{version}-DSO-libgcrypt.patch
 Patch1:		gnomint-1.2.1-compilefixes.patch
-Patch2:		gnomint-1.2.1-autoreconf-libgcrypt.patch
 
 BuildRequires:	gnutls-devel >= 2
 BuildRequires:	libgnomeui-devel
@@ -35,7 +34,6 @@ GTK/Gnome environments.
 %setup -q
 %patch0 -p1
 %patch1 -p1 -b .fix
-%patch2 -p1 -b .autoreconf
 
 %build
 autoreconf
@@ -93,6 +91,9 @@ update-desktop-database %{_datadir}/applications || :
 %{_datadir}/%{name}/*.ui
 
 %changelog
+* Mon Sep 08 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 1.2.1-125
+- Fix misapplication of libgcrypt patch (#1106691)
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-124
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild