SPECS: crossmingw32-freetype.spec - require zlib with hacked .la i...

[qboosh]

Author: qboosh                       Date: Mon Jan  7 22:51:05 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- require zlib with hacked .la instead of more ugly hacks here

---- Files affected:
SPECS:
   crossmingw32-freetype.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/crossmingw32-freetype.spec
diff -u SPECS/crossmingw32-freetype.spec:1.10 SPECS/crossmingw32-freetype.spec:1.11
--- SPECS/crossmingw32-freetype.spec:1.10	Sun Oct 21 19:21:58 2007
+++ SPECS/crossmingw32-freetype.spec	Mon Jan  7 23:50:59 2008
@@ -8,21 +8,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
@@ -97,7 +97,7 @@
 Biblioteka DLL freetype dla Windows.
 
 %prep
-%setup -q -n %{_realname}-%{version}
+%setup -q -n %{realname}-%{version}
 
 %build
 CFLAGS="%{rpmcflags} \
@@ -111,59 +111,14 @@
 
 %{__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
@@ -178,7 +133,6 @@
 %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
@@ -191,7 +145,7 @@
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/libfreetype.dll
+%{_dlldir}/libfreetype-*.dll
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -199,6 +153,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2008-01-07 22:50:59  qboosh
+- require zlib with hacked .la instead of more ugly hacks here
+
 Revision 1.10  2007-10-21 17:21:58  wolf
 - cut lua from shared library creation
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/crossmingw32-freetype.spec?r1=1.10&r2=1.11&f=u