X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fontconfig%2Fmingw-fontconfig.spec;h=9a74d51eab6cea54882cd4aa2b5aa01bc14409ae;hb=90d39594092be0d5f2b2d6aa8a9c42ae49bc16bc;hp=dad57ca57ba47d6b8df09929cf24cdbfe8945efd;hpb=af900336e6385b45e4880038c7597a0110b289ab;p=fedora-mingw.git

diff --git a/fontconfig/mingw-fontconfig.spec b/fontconfig/mingw-fontconfig.spec
index dad57ca..9a74d51 100644
--- a/fontconfig/mingw-fontconfig.spec
+++ b/fontconfig/mingw-fontconfig.spec
@@ -1,21 +1,33 @@
-%include /usr/lib/rpm/mingw-defs
+%define __strip %{_mingw_strip}
+%define __objdump %{_mingw_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw_findrequires}
+%define __find_provides %{_mingw_findprovides}
 
 Name:           mingw-fontconfig
 Version:        2.6.0
-Release:        1%{?dist}
+Release:        4%{?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)
 
+Patch0:         mingw-fontconfig-2.6.0-remove-logfile.patch
+
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
+BuildRequires:  mingw-freetype
+BuildRequires:  mingw-libxml2
+BuildRequires:  pkgconfig
+BuildRequires:  docbook-utils
+BuildRequires:  autoconf automake libtool
+
 
 %description
 MinGW Windows Fontconfig library.
@@ -23,15 +35,13 @@ MinGW Windows Fontconfig library.
 
 %prep
 %setup -q -n fontconfig-%{version}
+%patch0 -p1
+autoreconf
+
 
 %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
+PATH="%{_mingw_bindir}:$PATH" \
+%{_mingw_configure} --with-arch=i686
 make
 
 
@@ -42,6 +52,13 @@ 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
+
+# Remove duplicate manpages.
+rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -54,20 +71,24 @@ 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
 %{_mingw_includedir}/fontconfig/
 %{_mingw_sysconfdir}/fonts/
-%{_mingw_mandir}/man1/fc-cache.1*
-%{_mingw_mandir}/man1/fc-cat.1*
-%{_mingw_mandir}/man1/fc-list.1*
-%{_mingw_mandir}/man1/fc-match.1*
-%{_mingw_mandir}/man3/Fc*.3*
-%{_mingw_mandir}/man5/fonts-conf.5*
 %{_mingw_datadir}/doc/fontconfig
 
 %changelog
-* Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 2.18.0-1
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 2.6.0-4
+- Remove duplicate manpages.
+- Patch to delete logfile left when building (unused) manpages.
+
+* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 2.6.0-3
+- Add mingw_bindir to $PATH for freetype-config script
+
+* 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