[gnote] My autotools fu let me down

[Ankur Sinha]

commit 76473e51a12dc485ad5ce2c333e8ea6f49806f97
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur at gmail.com>
Date:   Thu Mar 7 12:07:04 2013 +1100

    My autotools fu let me down
    
    Patch was incomplete. Changes were needed in both Makefile.{am,in}
    (duh!). Since my initial patch only made changes to Makefile.am, the
    -pthread flag wasn't being picked up and the DSO linkage error
    persisted.

 gnote-3.7.3-dso-pthread.patch |   26 ++++++++++++++++++--------
 gnote.spec                    |    5 ++++-
 2 files changed, 22 insertions(+), 9 deletions(-)
---
diff --git a/gnote-3.7.3-dso-pthread.patch b/gnote-3.7.3-dso-pthread.patch
index 2cc4ca7..2200c7d 100644
--- a/gnote-3.7.3-dso-pthread.patch
+++ b/gnote-3.7.3-dso-pthread.patch
@@ -1,10 +1,20 @@
---- src/Makefile.am	2013-03-05 11:31:39.740954995 +1100
-+++ ../gnote-3.7.3/src/Makefile.am	2013-03-05 11:36:14.871556369 +1100
-@@ -19,6 +19,7 @@
- 	@LIBXSLT_LIBS@ \
- 	@GTKSPELL_LIBS@ @GTK_LIBS@ \
- 	@UUID_LIBS@ \
+diff -ur ./src/Makefile.am ../gnote-3.7.3/src/Makefile.am
+--- ./src/Makefile.am	2013-03-07 11:51:34.373136430 +1100
++++ ../gnote-3.7.3/src/Makefile.am	2013-03-07 11:52:10.234993603 +1100
+@@ -166,4 +166,5 @@
+ gnote_LDADD = \
+ 	$(GNOTE_LIBS) \
+ 	-lX11 \
 +	-lpthread \
- 	@LIBSECRET_LIBS@
- GNOTE_LIBS = libgnote.la $(LIBGNOTE_LIBS)
+ 	$(NULL)
+diff -ur ./src/Makefile.in ../gnote-3.7.3/src/Makefile.in
+--- ./src/Makefile.in	2013-03-07 11:51:34.445136144 +1100
++++ ../gnote-3.7.3/src/Makefile.in	2013-03-07 11:52:10.621992047 +1100
+@@ -616,6 +616,7 @@
+ gnote_LDADD = \
+ 	$(GNOTE_LIBS) \
+ 	-lX11 \
++	-lpthread \
+ 	$(NULL)
  
+ all: all-recursive
diff --git a/gnote.spec b/gnote.spec
index ad258ea..3b97ede 100644
--- a/gnote.spec
+++ b/gnote.spec
@@ -1,6 +1,6 @@
 Name:           gnote
 Version:        3.7.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Note-taking application
 Group:          User Interface/Desktops
 License:        GPLv3+
@@ -83,6 +83,9 @@ fi
 %{_datadir}/glib-2.0/schemas/org.gnome.gnote.gschema.xml
 
 %changelog
+* Thu Mar 07 2013 Ankur Sinha <ankursinha AT fedoraproject DOT org> 3.7.3-5
+- Complete patch. Tested as scratch build. Builds!
+
 * Tue Mar 05 2013 Ankur Sinha <ankursinha AT fedoraproject DOT org> 3.7.3-4
 - Spec bump, update patch, retry build