diff --git a/fontforge-20100501-python27.patch b/fontforge-20100501-python27.patch new file mode 100644 index 0000000..ddf6b45 --- /dev/null +++ b/fontforge-20100501-python27.patch @@ -0,0 +1,12 @@ +diff -Nur fontforge-20100501.orig/fontforge/ffpython.h fontforge-20100501/fontforge/ffpython.h +--- fontforge-20100501.orig/fontforge/ffpython.h 2010-04-05 14:10:26.000000000 -0600 ++++ fontforge-20100501/fontforge/ffpython.h 2010-07-28 12:07:25.000000000 -0600 +@@ -25,7 +25,7 @@ + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#if PY_MAJOR_VERSION >= 3 ++#if PY_MAJOR_VERSION >= 3 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION > 6) + + #define PyInt_Check PyLong_Check + #define PyInt_AsLong PyLong_AsLong diff --git a/fontforge.spec b/fontforge.spec index ea51ad3..18d9d71 100644 --- a/fontforge.spec +++ b/fontforge.spec @@ -5,7 +5,7 @@ Name: fontforge Version: 20100501 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Outline and bitmap font editor Group: Applications/Publishing @@ -18,6 +18,7 @@ Source3: fontforge.xml Patch1: fontforge-20090224-pythondl.patch # See Bug https://bugzilla.redhat.com/show_bug.cgi?id=536920 Patch2: fontforge-20100501-splinesets.patch +Patch3: fontforge-20100501-python27.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: xdg-utils @@ -60,6 +61,7 @@ to compile applications against fontforge. %patch1 -p1 %patch2 -p1 +%patch3 -p1 mkdir htdocs tar xjf %{SOURCE2} -C htdocs @@ -139,7 +141,7 @@ 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-1.0-py2.7.egg-info %{python_sitearch}/fontforge.so %{python_sitearch}/psMat.so @@ -150,6 +152,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jul 28 2010 Kevin Fenzi - 20100501-4 +- Add patch to build with python 2.7 + * Wed Jul 21 2010 David Malcolm - 20100501-3 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild