rpms/xournal/FC-6 xournal-configure.in-freetype.patch, NONE, 1.1 xournal.spec, 1.3, 1.4

[Rick L. Vinyard, Jr. (rvinyard)]

Author: rvinyard

Update of /cvs/extras/rpms/xournal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9890

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


xournal-configure.in-freetype.patch:

--- NEW FILE xournal-configure.in-freetype.patch ---
--- configure.in.orig	2007-09-21 19:12:00.000000000 -0600
+++ configure.in	2007-09-21 19:12:52.000000000 -0600
@@ -8,11 +8,11 @@
 AC_ISC_POSIX
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 
-pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0 freetype2"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
 AC_OUTPUT([


Index: xournal.spec
===================================================================
RCS file: /cvs/extras/rpms/xournal/FC-6/xournal.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xournal.spec	21 Sep 2007 18:07:31 -0000	1.3
+++ xournal.spec	22 Sep 2007 01:31:44 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xournal
 Version:	0.4.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Xournal notetaking, sketching and PDF annotation
 
 Group:		Applications/Editors
@@ -10,11 +10,13 @@
 Source1:	xournal.desktop
 Source2:	xournal.xml
 Source3:	x-xoj.desktop
+Patch0:		xournal-configure.in-freetype.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel >= 2.4.0 
 BuildRequires:	libgnomecanvas-devel >= 2.4.0 
 BuildRequires:	libgnomeprintui22-devel >= 2.0.0 
+BuildRequires:	freetype-devel >= 2.0.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	ImageMagick
 
@@ -28,7 +30,7 @@
 
 %prep
 %setup -q
-
+%patch
 
 %build
 NOCONFIGURE=1 ./autogen.sh
@@ -99,7 +101,11 @@
 
 
 %changelog
-* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
+* Fri Sep 21 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-2
+- Added freetype to build requires
+- Created patch to add freetype to configure.in pkgconfig
+
+* Thu Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
 - New upstream release
 - Changed source to use name and version variables
 - Updated xournal.desktop to reflect upstream changes