[mingw-freetype: 7/18] - New upstream version 2.3.11. - Match patches from Fedora native version. - Recheck package with rp

[epienbro]

commit caaab4fccbd43f9136898d82d0093d7f686c2f5d
Author: Richard W.M. Jones <rjones at fedoraproject.org>
Date:   Tue Jan 12 16:00:45 2010 +0000

    - New upstream version 2.3.11.
    - Match patches from Fedora native version.
    - Recheck package with rpmlint.

 .cvsignore                       |    4 ++--
 freetype-2.2.1-memcpy-fix.patch  |   14 --------------
 freetype-2.3.11-more-demos.patch |   18 ++++++++++++++++++
 mingw32-freetype.spec            |   17 +++++++++++------
 sources                          |    4 ++--
 5 files changed, 33 insertions(+), 24 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index ea5aeac..52a6868 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-freetype-2.3.8.tar.bz2
-freetype-doc-2.3.8.tar.bz2
+freetype-2.3.11.tar.bz2
+freetype-doc-2.3.11.tar.gz
diff --git a/freetype-2.3.11-more-demos.patch b/freetype-2.3.11-more-demos.patch
new file mode 100644
index 0000000..4b0046e
--- /dev/null
+++ b/freetype-2.3.11-more-demos.patch
@@ -0,0 +1,18 @@
+diff -up freetype-2.3.11/ft2demos-2.3.11/Makefile.more-demos freetype-2.3.11/ft2demos-2.3.11/Makefile
+--- freetype-2.3.11/ft2demos-2.3.11/Makefile.more-demos	2009-10-22 16:02:26.000000000 -0400
++++ freetype-2.3.11/ft2demos-2.3.11/Makefile	2009-10-22 16:02:32.000000000 -0400
+@@ -288,10 +288,10 @@ else
+   # Note that ttdebug only works if the FreeType's `truetype' driver has
+   # been compiled with TT_CONFIG_OPTION_BYTECODE_INTERPRETER defined.
+   #
+-  # EXES += ftchkwd
+-  # EXES += ftmemchk
+-  # EXES += ftpatchk
+-  # EXES += fttimer
++  EXES += ftchkwd
++  EXES += ftmemchk
++  EXES += ftpatchk
++  EXES += fttimer
+   # EXES += testname
+   # EXES += ttdebug
+ 
diff --git a/mingw32-freetype.spec b/mingw32-freetype.spec
index a95bdd7..d5b8b85 100644
--- a/mingw32-freetype.spec
+++ b/mingw32-freetype.spec
@@ -16,14 +16,14 @@
 %define with_xfree86 0
 
 Name:           mingw32-freetype
-Version:        2.3.8
-Release:        4%{?dist}
+Version:        2.3.11
+Release:        1%{?dist}
 Summary:        Free and portable font rendering engine
 
 License:        FTL or GPLv2+
 URL:            http://www.freetype.org
-Source:         http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2
-Source1:        http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.bz2
+Source:         http://mirrors.aixtools.net/sv/freetype/freetype-%{version}.tar.bz2
+Source1:        http://mirrors.aixtools.net/sv/freetype/freetype-doc-%{version}.tar.gz
 #Source2:        http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,8 +33,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch20:        freetype-2.1.10-enable-ft2-bci.patch
 Patch21:        freetype-2.3.0-enable-spr.patch
 Patch46:        freetype-2.2.1-enable-valid.patch
+#Patch47:        freetype-2.3.11-more-demos.patch
 Patch88:        freetype-multilib.patch
-Patch89:        freetype-2.2.1-memcpy-fix.patch
 
 BuildArch:      noarch
 
@@ -67,9 +67,9 @@ MinGW Windows Freetype library.
 %endif
 
 %patch46  -p1 -b .enable-valid
+#%patch47  -p1 -b .more-demos
 
 %patch88 -p1 -b .multilib
-%patch89 -p1 -b .memcpy
 
 
 %build
@@ -108,6 +108,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jan 12 2010 Richard W.M. Jones <rjones at redhat.com> - 2.3.11-1
+- New upstream version 2.3.11.
+- Match patches from Fedora native version.
+- Recheck package with rpmlint.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index a685a3b..70a4986 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6cf31a08826715a0d16ae366da9c7d3b  freetype-2.3.8.tar.bz2
-de1cc7cf098e11fba5898efdab1bc23d  freetype-doc-2.3.8.tar.bz2
+519c7cbf5cbd72ffa822c66844d3114c  freetype-2.3.11.tar.bz2
+a329c92c1d8c16464023149393851166  freetype-doc-2.3.11.tar.gz