rpms/xournal/F-11 xournal-configure.in.patch, NONE, 1.1 xournal.spec, 1.11, 1.12 xournal-configure.in-freetype.patch, 1.2, NONE

[Rick L. Vinyard, Jr.]

Author: rvinyard

Update of /cvs/pkgs/rpms/xournal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32737

Modified Files:
	xournal.spec 
Added Files:
	xournal-configure.in.patch 
Removed Files:
	xournal-configure.in-freetype.patch 
Log Message:


xournal-configure.in.patch:
 configure.in |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE xournal-configure.in.patch ---
--- 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


Index: xournal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/F-11/xournal.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- xournal.spec	6 Jan 2010 16:27:37 -0000	1.11
+++ xournal.spec	16 Feb 2010 19:54:26 -0000	1.12
@@ -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}/appl
 
 
 %changelog
+* Tue Feb 16 2010 Rick L Vinyard Jr <rvinyard at 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 at cs.nmsu.edu> 0.4.5-2
 - Added xournal-0.4.5-xoprint-len.patch to fix 64 bit systems
 


--- xournal-configure.in-freetype.patch DELETED ---