X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=freetype%2Fmingw-freetype.spec;h=916d714a2af63c5080c2b00dc0291e80531e8a97;hb=90d39594092be0d5f2b2d6aa8a9c42ae49bc16bc;hp=d51c5d38e0d43d39979d481a82605d6c0513bb23;hpb=f851b14216127f995b159c3d31586362a2c16300;p=fedora-mingw.git

diff --git a/freetype/mingw-freetype.spec b/freetype/mingw-freetype.spec
index d51c5d3..916d714 100644
--- a/freetype/mingw-freetype.spec
+++ b/freetype/mingw-freetype.spec
@@ -1,19 +1,30 @@
-%include /usr/lib/rpm/mingw-defs
+%define __strip %{_mingw_strip}
+%define __objdump %{_mingw_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw_findrequires}
+%define __find_provides %{_mingw_findprovides}
 
 Name:           mingw-freetype
 Version:        2.3.7
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Windows Freetype library
 
 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
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1:  freetype-2.1.10-enable-ft2-bci.patch
+Patch2:  freetype-2.3.0-enable-spr.patch
+Patch3:  freetype-2.2.1-enable-valid.patch
+Patch4:  freetype-2.2.1-memcpy-fix.patch
+
+
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 25
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-zlib
@@ -23,7 +34,7 @@ MinGW Windows Freetype library.
 
 
 %prep
-%setup -q -n freetype-%{version}
+%setup -q -n freetype-%{version} -b 1 -a 1
 
 %build
 %{_mingw_configure}
@@ -53,7 +64,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_libdir}/pkgconfig/freetype2.pc
 %{_mingw_datadir}/aclocal/freetype2.m4
 
+
 %changelog
+* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 2.3.7-4
+- Import patches from rawhide  & add docs
+
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 2.3.7-3
+- Depends on filesystem >= 25.
+
 * Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.3.7-2
 - Fix source URL.
 - Remove static libraries.