From 3580f4685cef5d702e9dfb785ae5e5f3b7edc9e8 Mon Sep 17 00:00:00 2001 From: Rick L. Vinyard, Jr Date: Sep 22 2007 01:20:15 +0000 Subject: *** empty log message *** --- diff --git a/xournal-configure.in-freetype.patch b/xournal-configure.in-freetype.patch new file mode 100644 index 0000000..6cd3fb4 --- /dev/null +++ b/xournal-configure.in-freetype.patch @@ -0,0 +1,15 @@ +--- 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([ diff --git a/xournal.spec b/xournal.spec index 9386238..ed4b83d 100644 --- a/xournal.spec +++ b/xournal.spec @@ -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 @@ Source0: http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz 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 @@ resolution) and overall functionality. %prep %setup -q - +%patch %build NOCONFIGURE=1 ./autogen.sh @@ -99,7 +101,11 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog -* Wed Sep 20 2007 Rick L Vinyard Jr 0.4.1-1 +* Fri Sep 21 2007 Rick L Vinyard Jr 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 0.4.1-1 - New upstream release - Changed source to use name and version variables - Updated xournal.desktop to reflect upstream changes