- updated to 2.5.0.1

diff --git a/crossmingw32-freetype.spec b/crossmingw32-freetype.spec
index c4aa015391fe078d6497dbbcb3574af2bf0d8169..7f0c59c9c61dfe350eb904241eeaa9b5f70969e5 100644 (file)
--- a/crossmingw32-freetype.spec
+++ b/crossmingw32-freetype.spec
@@ -6,18 +6,21 @@
 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.4.12
+Version:       2.5.0.1
 Release:       1
 License:       GPL v2 or FTL
 Group:         Development/Libraries
 Source0:       http://downloads.sourceforge.net/freetype/%{realname}-%{version}.tar.bz2
-# Source0-md5: 3463102764315eb86c0d3c2e1f3ffb7d
+# Source0-md5: c72e9010b1d986d556fc0b2b5fcbf31a
 URL:           http://www.freetype.org/
 BuildRequires: crossmingw32-bzip2
 BuildRequires: crossmingw32-gcc
+BuildRequires: crossmingw32-libpng
 BuildRequires: crossmingw32-zlib >= 1.2.3-2
+BuildRequires: pkgconfig
 BuildRequires: python
 Requires:      crossmingw32-bzip2
+Requires:      crossmingw32-libpng
 Requires:      crossmingw32-zlib >= 1.2.3-2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -46,7 +49,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %endif
 # -z options are invalid for mingw linker, most of -f options are Linux-specific
 %define                filterout_ld    -Wl,-z,.*
-%define                filterout_c             -f[-a-z0-9=]*
+%define                filterout_c     -f[-a-z0-9=]*
 
 %description
 The FreeType engine is a free and portable TrueType font rendering
@@ -93,6 +96,8 @@ Statyczna biblioteka freetype (wersja skrośna MinGW32).
 Summary:       DLL freetype library for Windows
 Summary(pl.UTF-8):     Biblioteka DLL freetype dla Windows
 Group:         Applications/Emulators
+Requires:      crossmingw32-bzip2-dll
+Requires:      crossmingw32-libpng-dll
 Requires:      crossmingw32-zlib-dll
 Requires:      wine
 
@@ -106,11 +111,14 @@ Biblioteka DLL freetype dla Windows.
 %setup -q -n %{realname}-%{version}
 
 %build
+export PKG_CONFIG_LIBDIR=%{_pkgconfigdir}
 CFLAGS="%{rpmcflags} \
 %{?with_lcd:-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING} \
 -DTT_CONFIG_OPTION_SUBPIXEL_HINTING \
 " \
 %configure \
+       LIBPNG_CFLAGS="$(pkg-config --cflags libpng)" \
+       LIBPNG_LDFLAGS="$(pkg-config --libs libpng)" \
        --target=%{target} \
        --build=i686-pc-linux-gnu \
        --host=%{target} \
@@ -125,14 +133,14 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_dlldir}
-mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+%{__mv} -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 
 %if 0%{!?debug:1}
 %{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/aclocal
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/aclocal
 
 %clean
 rm -rf $RPM_BUILD_ROOT