From 8bdf933db05bb8cccc8dc3847ee57143740271bb Mon Sep 17 00:00:00 2001
From: Parag Nemade <pnemade@redhat.com>
Date: Sep 08 2014 12:52:16 +0000
Subject: Patch Makefile.am to use system uthash-devel


---

diff --git a/.gitignore b/.gitignore
index 7435b1a..78e9d98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ fontforge_full-20100501.tar.bz2
 /fontforge_full-20120731-b.tar.bz2
 /fontforge_htdocs-20120731-b.tar.bz2
 /20140813.tar.gz
+/gnulib-2bf7326.tar.gz
diff --git a/fontforge-20140813-use-system-uthash.patch b/fontforge-20140813-use-system-uthash.patch
new file mode 100644
index 0000000..a9ad950
--- /dev/null
+++ b/fontforge-20140813-use-system-uthash.patch
@@ -0,0 +1,30 @@
+--- Makefile.am.old	2014-08-12 10:07:32.000000000 +0530
++++ Makefile.am	2014-09-08 16:23:56.046996941 +0530
+@@ -43,7 +43,6 @@
+ AM_CPPFLAGS =
+ AM_LDFLAGS =
+ 
+-BUILT_SOURCES = uthash/src
+ EXTRA_DIST =
+ CLEANFILES =
+ MOSTLYCLEANFILES =
+@@ -113,7 +112,6 @@
+ 	Packaging/FontForge-doc.spec \
+ 	Packaging/FontForge.spec \
+ 	Packaging/FontForge.static.spec \
+-	uthash/src \
+ 	$(NULL)
+ 
+ #--------------------------------------------------------------------------
+@@ -129,11 +127,6 @@
+ 
+ 
+ #--------------------------------------------------------------------------
+-uthash/src:
+-	if [ ! -e uthash/src ]; then \
+-	if [ -e uthash ] ; then rm -r uthash ; fi ; \
+-	git clone https://github.com/troydhanson/uthash ; \
+-	fi ;
+ 
+ # We import a selection of targets from Frank's standard packaging Makefile.
+ 
diff --git a/fontforge.spec b/fontforge.spec
index 24c7d24..5049162 100644
--- a/fontforge.spec
+++ b/fontforge.spec
@@ -11,6 +11,7 @@ License:        GPLv3+
 URL:            http://fontforge.github.io/
 Source0:        https://github.com/fontforge/fontforge/archive/%{archive_version}.tar.gz
 Source1:        http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=snapshot;h=%{gnulib_githead};sf=tgz;name=gnulib-%{gnulib_githead}.tar.gz
+Patch0:         fontforge-20140813-use-system-uthash.patch
 
 Requires:       xdg-utils
 Requires:       autotrace
@@ -34,6 +35,7 @@ BuildRequires:  python2-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  readline-devel
 BuildRequires:  python-ipython
+BuildRequires:  uthash-devel
 
 Provides: bundled(gnulib)
 
@@ -65,6 +67,8 @@ This package contains documentation files for %{name}.
 %setup -q -n %{name}-%{archive_version}
 tar xzf %{SOURCE1}
 
+%patch0 -p0
+
 sed -i -e '/^#!\//, 1d' pycontrib/graphicore.py
 sed -i -e '/^#!\//, 1d' pycontrib/webcollab.py
 
@@ -159,6 +163,7 @@ fi
 %changelog
 * Mon Sep 08 2014 Parag Nemade <pnemade AT redhat DOT com> - 20140813-2
 - Add gnulib source for bootstrap as koji don't have network
+- Patch Makefile.am to use system uthash-devel
 
 * Mon Sep 08 2014 Parag Nemade <pnemade AT redhat DOT com> - 20140813-1
 - Update to fontforge 2.0 snapshot 20140813
diff --git a/sources b/sources
index e66c045..6c6c9a2 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 495b933cdd642aadd797d5434e0d57a4  20140813.tar.gz
+149162d1d21a0dfc705a31916f4b0cd0  gnulib-2bf7326.tar.gz