X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=freetype%2Fmingw32-freetype.spec;fp=freetype%2Fmingw-freetype.spec;h=b97af3656403690f1f282fb8816ebb7d05e9b1e0;hb=14bb5f7a7a8110b0c21eef08c532bd7f18c42e8e;hp=916d714a2af63c5080c2b00dc0291e80531e8a97;hpb=bfb2581bd208d7f921e65ea388bf6f4f3f90adfb;p=fedora-mingw.git

diff --git a/freetype/mingw-freetype.spec b/freetype/mingw32-freetype.spec
similarity index 62%
rename from freetype/mingw-freetype.spec
rename to freetype/mingw32-freetype.spec
index 916d714..b97af36 100644
--- a/freetype/mingw-freetype.spec
+++ b/freetype/mingw32-freetype.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-freetype
+Name:           mingw32-freetype
 Version:        2.3.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW Windows Freetype library
 
 License:        FTL or GPLv2+
@@ -24,10 +24,10 @@ Patch4:  freetype-2.2.1-memcpy-fix.patch
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 25
-BuildRequires:  mingw-gcc
-BuildRequires:  mingw-binutils
-BuildRequires:  mingw-zlib
+BuildRequires:  mingw32-filesystem >= 25
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-zlib
 
 %description
 MinGW Windows Freetype library.
@@ -37,7 +37,7 @@ MinGW Windows Freetype library.
 %setup -q -n freetype-%{version} -b 1 -a 1
 
 %build
-%{_mingw_configure}
+%{_mingw32_configure}
 make
 
 
@@ -46,7 +46,7 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libfreetype.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libfreetype.a
 
 
 %clean
@@ -55,17 +55,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_mingw_bindir}/freetype-config
-%{_mingw_bindir}/libfreetype-6.dll
-%{_mingw_includedir}/freetype2
-%{_mingw_includedir}/ft2build.h
-%{_mingw_libdir}/libfreetype.dll.a
-%{_mingw_libdir}/libfreetype.la
-%{_mingw_libdir}/pkgconfig/freetype2.pc
-%{_mingw_datadir}/aclocal/freetype2.m4
+%{_mingw32_bindir}/freetype-config
+%{_mingw32_bindir}/libfreetype-6.dll
+%{_mingw32_includedir}/freetype2
+%{_mingw32_includedir}/ft2build.h
+%{_mingw32_libdir}/libfreetype.dll.a
+%{_mingw32_libdir}/libfreetype.la
+%{_mingw32_libdir}/pkgconfig/freetype2.pc
+%{_mingw32_datadir}/aclocal/freetype2.m4
 
 
 %changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 2.3.7-5
+- Rename mingw -> mingw32.
+
 * Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 2.3.7-4
 - Import patches from rawhide  & add docs