- require zlib with hacked .la instead of more ugly hacks here

Changed files:
    crossmingw32-freetype.spec -> 1.11

diff --git a/crossmingw32-freetype.spec b/crossmingw32-freetype.spec
index e8d9fbcf3aa1a754b31e4b5273dfd2243fae1b36..5defc8a617d6a6b2351e3a9d2264500a8fa35013 100644 (file)
--- a/crossmingw32-freetype.spec
+++ b/crossmingw32-freetype.spec
@@ -7,21 +7,21 @@
 #                 subpixel rendering for LCD (only used with a new 2.3.0 API;
 #                 patents pending)
 #
-%define                _realname   freetype
+%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}
+Name:          crossmingw32-%{realname}
 Version:       2.3.5
 Release:       1
 License:       GPL or FTL
 Group:         Development/Libraries
-Source0:       http://savannah.nongnu.org/download/freetype/%{_realname}-%{version}.tar.bz2
+Source0:       http://savannah.nongnu.org/download/freetype/%{realname}-%{version}.tar.bz2
 # Source0-md5: 65234327c5ac46ee00ebda15995d4c1c
 URL:           http://www.freetype.org/
 BuildRequires: crossmingw32-gcc
-BuildRequires: crossmingw32-zlib
+BuildRequires: crossmingw32-zlib >= 1.2.3-2
 BuildRequires: python
-Requires:      crossmingw32-zlib
+Requires:      crossmingw32-zlib >= 1.2.3-2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                specflags_ia32  -fomit-frame-pointer
@@ -96,7 +96,7 @@ DLL freetype library for Windows.
 Biblioteka DLL freetype dla Windows.
 
 %prep
-%setup -q -n %{_realname}-%{version}
+%setup -q -n %{realname}-%{version}
 
 %build
 CFLAGS="%{rpmcflags} \
@@ -110,59 +110,14 @@ CFLAGS="%{rpmcflags} \
 
 %{__make}
 
-# link shared library
-cd objs/.libs
-%{__cc} \
-       --shared *.o -lm -o libfreetype.dll \
-       -Wl,--enable-auto-image-base -Wl,--out-implib,libfreetype.dll.a -lz
-cd ../..
-
-cat << "EOF" >> libfreetype.la
-# libfreetype.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names='libfreetype.dll.a'
-
-# The name of the static archive.
-old_library='libfreetype.a'
-
-# Libraries that this one depends upon.
-dependency_libs=' -lz'
-
-# Version information for libfreetype.
-current=9
-age=3
-revision=16
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='%{_libdir}'
-EOF
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install libfreetype.la $RPM_BUILD_ROOT%{_libdir}
-
 install -d $RPM_BUILD_ROOT%{_dlldir}
-install objs/.libs/libfreetype.dll $RPM_BUILD_ROOT%{_dlldir}
-install objs/.libs/libfreetype.dll.a $RPM_BUILD_ROOT%{_libdir}
+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
@@ -177,7 +132,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc docs/{CHANGES,FTL.TXT,LICENSE.TXT,PATENTS,TODO,formats.txt,raster.txt}
-%{_bindir}/freetype-config
 %{_libdir}/libfreetype.dll.a
 %{_libdir}/libfreetype.la
 %{_includedir}/freetype2
@@ -190,4 +144,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/libfreetype.dll
+%{_dlldir}/libfreetype-*.dll