mingw -> mingw32 rename and miscellanous related fixes.

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

diff --git a/pixman/mingw-pixman.spec b/pixman/mingw32-pixman.spec
similarity index 60%
rename from pixman/mingw-pixman.spec
rename to pixman/mingw32-pixman.spec
index 25399c1..f724f6e 100644 (file)
--- a/pixman/mingw-pixman.spec
+++ b/pixman/mingw32-pixman.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-pixman
+Name:           mingw32-pixman
 Version:        0.12.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Pixman library
 
 License:        MIT
@@ -17,9 +17,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 23
-BuildRequires:  mingw-gcc
-BuildRequires:  mingw-binutils
+BuildRequires:  mingw32-filesystem >= 23
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-binutils
 
 %description
 MinGW Windows Pixman library.
@@ -31,7 +31,7 @@ MinGW Windows Pixman library.
 %build
 # Uses GTK for its testsuite, so disable this otherwise
 # we have a chicken & egg problem on mingw
-%{_mingw_configure} --disable-gtk
+%{_mingw32_configure} --disable-gtk
 make
 
 
@@ -40,7 +40,7 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm $RPM_BUILD_ROOT/%{_mingw_libdir}/libpixman-1.a
+rm $RPM_BUILD_ROOT/%{_mingw32_libdir}/libpixman-1.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,13 +48,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_mingw_bindir}/libpixman-1-0.dll
-%{_mingw_includedir}/pixman-1
-%{_mingw_libdir}/libpixman-1.dll.a
-%{_mingw_libdir}/libpixman-1.la
-%{_mingw_libdir}/pkgconfig/pixman-1.pc
+%{_mingw32_bindir}/libpixman-1-0.dll
+%{_mingw32_includedir}/pixman-1
+%{_mingw32_libdir}/libpixman-1.dll.a
+%{_mingw32_libdir}/libpixman-1.la
+%{_mingw32_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 0.12.0-2
+- Rename mingw -> mingw32.
+
 * Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 0.12.0-1
 - Update to 0.12.0 release