Very preliminary NSIS patch.

[fedora-mingw.git] / fontconfig / mingw-fontconfig.spec

diff --git a/fontconfig/mingw-fontconfig.spec b/fontconfig/mingw-fontconfig.spec
index dad57ca..2a523e3 100644 (file)
--- a/fontconfig/mingw-fontconfig.spec
+++ b/fontconfig/mingw-fontconfig.spec
@@ -2,12 +2,12 @@
 
 Name:           mingw-fontconfig
 Version:        2.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Fontconfig library
 
-License: MIT
-URL: http://fontconfig.org
-Source0: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
+License:        MIT
+URL:            http://fontconfig.org
+Source0:        http://fontconfig.org/release/fontconfig-%{version}.tar.gz
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -16,6 +16,8 @@ BuildArch:      noarch
 BuildRequires:  mingw-filesystem >= 19
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
+BuildRequires:  mingw-freetype
+BuildRequires:  mingw-libxml2
 
 %description
 MinGW Windows Fontconfig library.
@@ -25,13 +27,7 @@ MinGW Windows Fontconfig library.
 %setup -q -n fontconfig-%{version}
 
 %build
-PKG_CONFIG_PATH=%{_mingw_libdir}/pkgconfig \
-#{_mingw_configure} --with-arch=i686
-  CC="%{_mingw_cc}" \
-  CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2  -fexceptions  --param=ssp-buffer-size=4" \
-  ./configure \
-    --build=%_build --host=%{_mingw_host} --target=%{_mingw_target} \
-    --prefix=%{_mingw_prefix} --with-arch=i686
+%{_mingw_configure} --with-arch=i686
 make
 
 
@@ -42,6 +38,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 rm -f $RPM_BUILD_ROOT/%{_mingw_libdir}/charset.alias
 
+# Remove static library.
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libfontconfig.a
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -54,7 +53,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_bindir}/fc-match.exe
 %{_mingw_bindir}/libfontconfig-1.dll
 %{_mingw_libdir}/fontconfig.def
-%{_mingw_libdir}/libfontconfig.a
 %{_mingw_libdir}/libfontconfig.dll.a
 %{_mingw_libdir}/libfontconfig.la
 %{_mingw_libdir}/pkgconfig/fontconfig.pc
@@ -69,5 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_datadir}/doc/fontconfig
 
 %changelog
-* Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 2.18.0-1
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.6.0-2
+- Remove static library.
+- +BR mingw-libxml2.
+
+* Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 2.6.0-1
 - Initial RPM release