- fix building with python 2.7

Changed files:
    fontforge-python2.7.patch -> 1.1
    fontforge.spec -> 1.23

diff --git a/fontforge-python2.7.patch b/fontforge-python2.7.patch
new file mode 100644 (file)
index 0000000..d8bde98
--- /dev/null
+++ b/fontforge-python2.7.patch
@@ -0,0 +1,11 @@
+--- fontforge-20100501/fontforge/ffpython.h~   2010-04-05 22:10:26.000000000 +0200
++++ fontforge-20100501/fontforge/ffpython.h    2010-07-22 14:27:51.998839706 +0200
+@@ -43,7 +43,7 @@
+ 
+ #define STRING_CHECK   PyBytes_Check
+ #define STRING_TO_PY   PyBytes_FromString
+-#define DECODE_UTF8(s, size, errors) PyBytes_Decode(s, size, "UTF-8", errors)
++#define DECODE_UTF8(s, size, errors) PyString_Decode(s, size, "UTF-8", errors)
+ #define PYBYTES_UTF8(str)            PyString_AsEncodedObject(str, "UTF-8", NULL)
+ #define STRING_FROM_FORMAT           PyBytes_FromFormat
+ 

diff --git a/fontforge.spec b/fontforge.spec
index b6de3aa8e054b37fe3c1c9625b9855e249d8021e..40a2dca98b0820c443c56d2c8df14f445f0b29c8 100644 (file)
--- a/fontforge.spec
+++ b/fontforge.spec
@@ -8,6 +8,7 @@ Group:          X11/Applications/Publishing
 Source0:       http://dl.sourceforge.net/fontforge/%{name}_full-%{version}.tar.bz2
 # Source0-md5: 5f3d20d645ec1aa2b7b4876386df8717
 Patch0:                %{name}-sonames.patch
+Patch1:                %{name}-python2.7.patch
 URL:           http://fontforge.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -50,6 +51,7 @@ FontForge wcześniej nazywał się PfaEdit.
 %setup -q
 # hardcoded in code is +- same as hardcoded at compile time
 #%patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}