From eb4631ef088a4f15e80193d9adca320b4b83b321 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@fedoraproject.org>
Date: Feb 21 2009 00:47:37 +0000
Subject: Upgrade to 20081224 Enable python bindings


---

diff --git a/.cvsignore b/.cvsignore
index 6c40356..18fff41 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-fontforge_full-20081215.tar.bz2
-fontforge_htdocs-20081215.tar.bz2
+fontforge_full-20081224.tar.bz2
+fontforge_htdocs-20081224.tar.bz2
diff --git a/fontforge-20081215-pangocairo.patch b/fontforge-20081215-pangocairo.patch
deleted file mode 100644
index ee6b106..0000000
--- a/fontforge-20081215-pangocairo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur fontforge-20081215.orig/gdraw/gxcdraw.c fontforge-20081215/gdraw/gxcdraw.c
---- fontforge-20081215.orig/gdraw/gxcdraw.c	2008-11-17 09:19:44.000000000 -0700
-+++ fontforge-20081215/gdraw/gxcdraw.c	2008-12-16 13:59:58.000000000 -0700
-@@ -1782,9 +1782,10 @@
- #  if !defined(_NO_LIBCAIRO) && PANGO_VERSION_MINOR>=10
- #   include <pango/pangocairo.h>
- #   define _pango_cairo_layout_path pango_cairo_layout_path
--#   define _pango_font_map_create_context pango_font_map_create_context
-+#   define _pango_cairo_font_map_create_context pango_cairo_font_map_create_context
- #   define _pango_cairo_font_map_get_default pango_cairo_font_map_get_default
--#   define _pango_cairo_context_set_resolution _pango_cairo_context_set_resolution
-+#   define _pango_cairo_context_set_resolution pango_cairo_context_set_resolution
-+#   define _pango_cairo_show_glyph_string pango_cairo_show_glyph_string
- #  endif
- #  undef GTimer
- #  if PANGO_VERSION_MINOR>=8
diff --git a/fontforge.spec b/fontforge.spec
index 64c9186..988696e 100644
--- a/fontforge.spec
+++ b/fontforge.spec
@@ -1,9 +1,11 @@
-%define docs_version 20081215
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+%define docs_version 20081224
 %define gettext_package FontForge
 
 Name:           fontforge
-Version:        20081215
-Release:        2%{?dist}
+Version:        20081224
+Release:        1%{?dist}
 Summary:        Outline and bitmap font editor
 
 Group:          Applications/Publishing
@@ -13,7 +15,6 @@ Source0:        http://downloads.sourceforge.net/fontforge/fontforge_full-%{vers
 Source1:        fontforge.desktop
 Source2:        http://downloads.sourceforge.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2
 Source3:        fontforge.xml
-Patch1:         fontforge-20081215-pangocairo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       xdg-utils
@@ -33,6 +34,7 @@ BuildRequires:  gettext
 BuildRequires:  pango-devel
 BuildRequires:  cairo-devel
 BuildRequires:  libspiro-devel
+BuildRequires:  python-devel
 
 %description
 FontForge (former PfaEdit) is a font editor for outline and bitmap
@@ -53,8 +55,6 @@ to compile applications against fontforge.
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch1 -p1
-
 mkdir htdocs
 tar xjf %{SOURCE2} -C htdocs
 rm -rf htdocs/scripts
@@ -68,7 +68,7 @@ rm -rf htdocs/flags/CVS
 %{__sed} -i 's/\r//' htdocs/corpchar.txt
 
 %build
-%configure --with-freetype-bytecode=no --with-regular-link
+%configure --with-freetype-bytecode=no --with-regular-link --enable-pyextension
 
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -131,6 +131,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_datadir}/pixmaps/fontforge.png
 %{_mandir}/man1/*.1*
 %{_datadir}/mime/packages/fontforge.xml
+%{python_sitearch}/fontforge-1.0-py2.6.egg-info
+%{python_sitearch}/fontforge.so
+%{python_sitearch}/psMat.so
 
 %files devel
 %defattr(0644,root,root,0755)
@@ -139,6 +142,16 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Feb 20 2009 Kevin Fenzi <kevin@tummy.com> - 20081224-1
+- Upgrade to 20081224
+- Enable python bindings
+
+* Wed Jan 21 2009 Kevin Fenzi <kevin@tummy.com> - 20081215-4
+- Add python-devel to BuildRequires
+
+* Tue Dec 23 2008 Kevin Fenzi <kevin@tummy.com> - 20081215-3
+- Add patch to fix buffer overflow. Fixes 471538
+
 * Wed Dec 17 2008 Kevin Fenzi <kevin@tummy.com> - 20081215-2
 - Add libspiro-devel to build with spiro
 
diff --git a/sources b/sources
index d31aaa2..f9bfb36 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fdbca231134755fd0cf20572d955855f  fontforge_full-20081215.tar.bz2
-f41861cdef84e282da5a765f644582e8  fontforge_htdocs-20081215.tar.bz2
+eb00467bff69b15a4137595c16cdbff5  fontforge_full-20081224.tar.bz2
+476b047dc6cdc36d79ac34da1c3fcb58  fontforge_htdocs-20081224.tar.bz2