X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=crossmingw32-freetype.spec;h=280bac2470cf96a528e305e0cda6fa5ef4793410;hb=f206c06b0328a5e507b04a7b1e5e4412ed606a9b;hp=7f0c59c9c61dfe350eb904241eeaa9b5f70969e5;hpb=1f1d4f6717cab5e4a0b0a838297897c900074b21;p=packages%2Fcrossmingw32-freetype.git

diff --git a/crossmingw32-freetype.spec b/crossmingw32-freetype.spec
index 7f0c59c..280bac2 100644
--- a/crossmingw32-freetype.spec
+++ b/crossmingw32-freetype.spec
@@ -1,25 +1,28 @@
 #
 # Conditional build:
 %bcond_without	lcd		# without LCD subpixel color filtering (Microsoft patents in USA)
+%bcond_without	harfbuzz	# harfbuzz based autohinting
 #
 %define		realname   freetype
 Summary:	TrueType font rasterizer - MinGW32 cross version
 Summary(pl.UTF-8):	Rasteryzer fontów TrueType - wersja skrośna dla MinGW32
 Name:		crossmingw32-%{realname}
-Version:	2.5.0.1
+Version:	2.8
 Release:	1
 License:	GPL v2 or FTL
 Group:		Development/Libraries
-Source0:	http://downloads.sourceforge.net/freetype/%{realname}-%{version}.tar.bz2
-# Source0-md5:	c72e9010b1d986d556fc0b2b5fcbf31a
+Source0:	http://download.savannah.gnu.org/releases/freetype/%{realname}-%{version}.tar.bz2
+# Source0-md5:	2413ac3eaf508ada019c63959ea81a92
 URL:		http://www.freetype.org/
 BuildRequires:	crossmingw32-bzip2
 BuildRequires:	crossmingw32-gcc
+%{?with_harfbuzz:BuildRequires:	crossmingw32-harfbuzz >= 0.9.21}
 BuildRequires:	crossmingw32-libpng
 BuildRequires:	crossmingw32-zlib >= 1.2.3-2
-BuildRequires:	pkgconfig
+BuildRequires:	pkgconfig >= 1:0.24
 BuildRequires:	python
 Requires:	crossmingw32-bzip2
+%{?with_harfbuzz:Requires:	crossmingw32-harfbuzz >= 0.9.21}
 Requires:	crossmingw32-libpng
 Requires:	crossmingw32-zlib >= 1.2.3-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -97,6 +100,7 @@ Summary:	DLL freetype library for Windows
 Summary(pl.UTF-8):	Biblioteka DLL freetype dla Windows
 Group:		Applications/Emulators
 Requires:	crossmingw32-bzip2-dll
+%{?with_harfbuzz:Requires:	crossmingw32-harfbuzz-dll >= 0.9.21}
 Requires:	crossmingw32-libpng-dll
 Requires:	crossmingw32-zlib-dll
 Requires:	wine
@@ -122,7 +126,8 @@ CFLAGS="%{rpmcflags} \
 	--target=%{target} \
 	--build=i686-pc-linux-gnu \
 	--host=%{target} \
-	--enable-shared
+	--enable-shared \
+	%{!?with_harfbuzz:--without-harfbuzz}
 
 %{__make}
 
@@ -140,6 +145,9 @@ install -d $RPM_BUILD_ROOT%{_dlldir}
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/freetype-config \
+	$RPM_BUILD_ROOT%{_mandir}/man1/freetype-config.1
+
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/aclocal
 
 %clean
@@ -151,7 +159,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libfreetype.dll.a
 %{_libdir}/libfreetype.la
 %{_includedir}/freetype2
-%{_includedir}/ft2build.h
 %{_pkgconfigdir}/freetype2.pc
 
 %files static