From 4f0cc3f3168d5ae25188f9284e2d5afacd4cd5ef Mon Sep 17 00:00:00 2001
From: Rick L. Vinyard, Jr <rvinyard@fedoraproject.org>
Date: Feb 16 2010 19:54:17 +0000
Subject: *** empty log message ***


---

diff --git a/xournal-configure.in-freetype.patch b/xournal-configure.in-freetype.patch
deleted file mode 100644
index 3d6f339..0000000
--- a/xournal-configure.in-freetype.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.in.orig	2009-10-05 09:32:56.000000000 -0600
-+++ configure.in	2009-10-05 09:34:42.000000000 -0600
-@@ -9,11 +9,11 @@
- AC_PROG_CC
- AM_PROG_CC_STDC
- AC_PROG_RANLIB
- AC_HEADER_STDC
- 
--pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4"
-+pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 freetype2"
- PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
- AC_SUBST(PACKAGE_CFLAGS)
- AC_SUBST(PACKAGE_LIBS)
- 
- GETTEXT_PACKAGE=xournal
diff --git a/xournal-configure.in.patch b/xournal-configure.in.patch
new file mode 100644
index 0000000..1f667dc
--- /dev/null
+++ b/xournal-configure.in.patch
@@ -0,0 +1,18 @@
+--- xournal-0.4.5/configure.in.old	2010-02-16 09:23:51.000000000 -0700
++++ xournal-0.4.5/configure.in	2010-02-16 09:37:10.000000000 -0700
+@@ -9,11 +9,14 @@
+ AC_PROG_CC
+ AM_PROG_CC_STDC
+ AC_PROG_RANLIB
+ AC_HEADER_STDC
+ 
+-pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4"
++AC_CHECK_LIB([m],[sin])
++AC_CHECK_LIB([z],[gzclose])
++
++pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 freetype2 x11"
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+ AC_SUBST(PACKAGE_CFLAGS)
+ AC_SUBST(PACKAGE_LIBS)
+ 
+ GETTEXT_PACKAGE=xournal
diff --git a/xournal.spec b/xournal.spec
index dee5e35..dc2f777 100644
--- a/xournal.spec
+++ b/xournal.spec
@@ -1,13 +1,13 @@
 Name:		xournal
 Version:	0.4.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Notetaking, sketching, PDF annotation and general journal
 
 Group:		Applications/Editors
 License:	GPLv2
 URL:		http://xournal.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz
-Patch0:		xournal-configure.in-freetype.patch
+Patch0:		xournal-configure.in.patch
 Patch1:		xournal-0.4.5-xoprint-len.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,7 +30,7 @@ resolution) and overall functionality.
 
 %prep
 %setup -q
-%patch0
+%patch0 -p1
 %patch1 -p1
 
 %build
@@ -103,6 +103,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Tue Feb 16 2010 Rick L Vinyard Jr <rvinyard@cs.nmsu.edu> 0.4.5-3
+- Remove freetype patch and add general configure.in patch to
+  fix implicit DSO linking
+
 * Wed Jan 06 2010 Rick L Vinyard Jr <rvinyard@cs.nmsu.edu> 0.4.5-2
 - Added xournal-0.4.5-xoprint-len.patch to fix 64 bit systems