- up to 20110222

Changed files:
    fontforge-python2.7.patch -> 1.2
    fontforge.spec -> 1.29

diff --git a/fontforge-python2.7.patch b/fontforge-python2.7.patch
deleted file mode 100644 (file)
index d8bde98..0000000
--- a/fontforge-python2.7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 2cbba9b570691bd7a94257d9bb8360d7142f2255..78445979677839d2937432ab733fc15430ded879 100644 (file)
--- a/fontforge.spec
+++ b/fontforge.spec
@@ -1,14 +1,13 @@
 Summary:       An outline font editor
 Summary(pl.UTF-8):     Edytor fontów rysowanych
 Name:          fontforge
-Version:       20100501
-Release:       2
+Version:       20110222
+Release:       1
 License:       BSD
 Group:         X11/Applications/Publishing
 Source0:       http://dl.sourceforge.net/fontforge/%{name}_full-%{version}.tar.bz2
-# Source0-md5: 5f3d20d645ec1aa2b7b4876386df8717
+# Source0-md5: 5be4dda345b5d73a27cc399df96e463a
 Patch0:                %{name}-link.patch
-Patch1:                %{name}-python2.7.patch
 #Patch0:               %{name}-sonames.patch
 URL:           http://fontforge.sourceforge.net/
 BuildRequires: autoconf
@@ -66,7 +65,6 @@ Pliki nagłówkowe bibliotek FontForge.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -88,9 +86,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-# Malayalam is ml
-mv $RPM_BUILD_ROOT%{_datadir}/locale/{mal,ml}
-
 %find_lang FontForge
 
 %clean