mingw -> mingw32 rename and miscellanous related fixes.

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

diff --git a/fontconfig/mingw-fontconfig.spec b/fontconfig/mingw32-fontconfig.spec
similarity index 52%
rename from fontconfig/mingw-fontconfig.spec
rename to fontconfig/mingw32-fontconfig.spec
index 9a74d51..372d6f1 100644 (file)
--- a/fontconfig/mingw-fontconfig.spec
+++ b/fontconfig/mingw32-fontconfig.spec
@@ -1,12 +1,12 @@
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
 %define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
 
-Name:           mingw-fontconfig
+Name:           mingw32-fontconfig
 Version:        2.6.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW Windows Fontconfig library
 
 License:        MIT
@@ -15,15 +15,15 @@ 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
+Patch0:         mingw32-fontconfig-2.6.0-remove-logfile.patch
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 23
-BuildRequires:  mingw-gcc
-BuildRequires:  mingw-binutils
-BuildRequires:  mingw-freetype
-BuildRequires:  mingw-libxml2
+BuildRequires:  mingw32-filesystem >= 23
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-freetype
+BuildRequires:  mingw32-libxml2
 BuildRequires:  pkgconfig
 BuildRequires:  docbook-utils
 BuildRequires:  autoconf automake libtool
@@ -40,8 +40,8 @@ autoreconf
 
 
 %build
-PATH="%{_mingw_bindir}:$PATH" \
-%{_mingw_configure} --with-arch=i686
+PATH="%{_mingw32_bindir}:$PATH" \
+%{_mingw32_configure} --with-arch=i686
 make
 
 
@@ -50,13 +50,13 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm -f $RPM_BUILD_ROOT/%{_mingw_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
 
 # Remove static library.
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libfontconfig.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libfontconfig.a
 
 # Remove duplicate manpages.
-rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
+rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
 
 
 %clean
@@ -65,20 +65,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_mingw_bindir}/fc-cache.exe
-%{_mingw_bindir}/fc-cat.exe
-%{_mingw_bindir}/fc-list.exe
-%{_mingw_bindir}/fc-match.exe
-%{_mingw_bindir}/libfontconfig-1.dll
-%{_mingw_libdir}/fontconfig.def
-%{_mingw_libdir}/libfontconfig.dll.a
-%{_mingw_libdir}/libfontconfig.la
-%{_mingw_libdir}/pkgconfig/fontconfig.pc
-%{_mingw_includedir}/fontconfig/
-%{_mingw_sysconfdir}/fonts/
-%{_mingw_datadir}/doc/fontconfig
+%{_mingw32_bindir}/fc-cache.exe
+%{_mingw32_bindir}/fc-cat.exe
+%{_mingw32_bindir}/fc-list.exe
+%{_mingw32_bindir}/fc-match.exe
+%{_mingw32_bindir}/libfontconfig-1.dll
+%{_mingw32_libdir}/fontconfig.def
+%{_mingw32_libdir}/libfontconfig.dll.a
+%{_mingw32_libdir}/libfontconfig.la
+%{_mingw32_libdir}/pkgconfig/fontconfig.pc
+%{_mingw32_includedir}/fontconfig/
+%{_mingw32_sysconfdir}/fonts/
+%{_mingw32_datadir}/doc/fontconfig
 
 %changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 2.6.0-5
+- Rename mingw -> mingw32.
+
 * 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.