mingw -> mingw32 rename and miscellanous related fixes.

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

diff --git a/libxml2/mingw-libxml2.spec b/libxml2/mingw32-libxml2.spec
similarity index 55%
rename from libxml2/mingw-libxml2.spec
rename to libxml2/mingw32-libxml2.spec
index 6c01f5f..da3fa27 100644 (file)
--- a/libxml2/mingw-libxml2.spec
+++ b/libxml2/mingw32-libxml2.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-libxml2
+Name:           mingw32-libxml2
 Version:        2.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT
@@ -17,11 +17,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 23
-BuildRequires:  mingw-gcc
-BuildRequires:  mingw-binutils
-BuildRequires:  mingw-zlib
-BuildRequires:  mingw-gettext
+BuildRequires:  mingw32-filesystem >= 23
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-zlib
+BuildRequires:  mingw32-gettext
 
 
 %description
@@ -33,7 +33,7 @@ MinGW Windows libxml2 XML processing library.
 
 
 %build
-LDFLAGS="-no-undefined" %{_mingw_configure} --without-python
+LDFLAGS="-no-undefined" %{_mingw32_configure} --without-python
 make
 
 
@@ -42,10 +42,10 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libxml2.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libxml2.a
 
 # Remove manpages which duplicate Fedora native.
-rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
+rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
 
 
 %clean
@@ -54,22 +54,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_mingw_bindir}/libxml2-2.dll
-%{_mingw_bindir}/xml2-config
-%{_mingw_bindir}/xmlcatalog.exe
-%{_mingw_bindir}/xmllint.exe
-%{_mingw_libdir}/libxml2.dll.a
-%{_mingw_libdir}/libxml2.la
-%{_mingw_libdir}/pkgconfig
-%{_mingw_libdir}/pkgconfig/libxml-2.0.pc
-%{_mingw_libdir}/xml2Conf.sh
-%{_mingw_includedir}/libxml2
-%{_mingw_datadir}/aclocal/*
-%{_mingw_docdir}/libxml2-%{version}/
-%{_mingw_datadir}/gtk-doc/html/libxml2/
+%{_mingw32_bindir}/libxml2-2.dll
+%{_mingw32_bindir}/xml2-config
+%{_mingw32_bindir}/xmlcatalog.exe
+%{_mingw32_bindir}/xmllint.exe
+%{_mingw32_libdir}/libxml2.dll.a
+%{_mingw32_libdir}/libxml2.la
+%{_mingw32_libdir}/pkgconfig
+%{_mingw32_libdir}/pkgconfig/libxml-2.0.pc
+%{_mingw32_libdir}/xml2Conf.sh
+%{_mingw32_includedir}/libxml2
+%{_mingw32_datadir}/aclocal/*
+%{_mingw32_docdir}/libxml2-%{version}/
+%{_mingw32_datadir}/gtk-doc/html/libxml2/
 
 
 %changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 2.7.1-2
+- Rename mingw -> mingw32.
+
 * Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 2.7.1-1
 - Update to 2.7.1 release