mingw -> mingw32 rename and miscellanous related fixes.

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

diff --git a/atk/mingw-atk.spec b/atk/mingw32-atk.spec
similarity index 55%
rename from atk/mingw-atk.spec
rename to atk/mingw32-atk.spec
index 35da21b..8b74ac0 100644 (file)
--- a/atk/mingw-atk.spec
+++ b/atk/mingw32-atk.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-atk
+Name:           mingw32-atk
 Version:        1.24.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Atk library
 
 License:        LGPLv2+
@@ -17,18 +17,19 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 23
-BuildRequires:  mingw-gcc
-BuildRequires:  mingw-binutils
-BuildRequires:  mingw-iconv
-BuildRequires:  mingw-gettext
-BuildRequires:  mingw-glib2
+BuildRequires:  mingw32-filesystem >= 23
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-iconv
+BuildRequires:  mingw32-gettext
+BuildRequires:  mingw32-glib2
 BuildRequires:  pkgconfig
 # Need native one too for msgfmt
 BuildRequires:  gettext
 # Need native one too for  glib-genmarshal
 BuildRequires:  glib2-devel
 
+
 %description
 MinGW Windows Atk library.
 
@@ -36,8 +37,9 @@ MinGW Windows Atk library.
 %prep
 %setup -q -n atk-%{version}
 
+
 %build
-%{_mingw_configure}
+%{_mingw32_configure}
 make
 
 
@@ -46,7 +48,8 @@ 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
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,16 +57,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_mingw_bindir}/libatk-1.0-0.dll
-%{_mingw_includedir}/atk-1.0
-%{_mingw_libdir}/atk-1.0.def
-%{_mingw_libdir}/libatk-1.0.dll.a
-%{_mingw_libdir}/libatk-1.0.la
-%{_mingw_libdir}/pkgconfig/atk.pc
-%{_mingw_datadir}/gtk-doc/html/atk/
-%{_mingw_datadir}/locale/*/LC_MESSAGES/atk10.mo
+%{_mingw32_bindir}/libatk-1.0-0.dll
+%{_mingw32_includedir}/atk-1.0
+%{_mingw32_libdir}/atk-1.0.def
+%{_mingw32_libdir}/libatk-1.0.dll.a
+%{_mingw32_libdir}/libatk-1.0.la
+%{_mingw32_libdir}/pkgconfig/atk.pc
+%{_mingw32_datadir}/gtk-doc/html/atk/
+%{_mingw32_datadir}/locale/*/LC_MESSAGES/atk10.mo
+
 
 %changelog
+* Wed Sep 24 2008 Daniel P. Berrange <berrange@redhat.com> - 1.24.0-2
+- Rename mingw -> mingw32.
+
 * Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 1.24.0-1
 - Update to 1.24.0 release