Replace %include of defs with explicit macros to avoid chicken+egg problem in mock...

[fedora-mingw.git] / w32api / mingw-w32api.spec

diff --git a/w32api/mingw-w32api.spec b/w32api/mingw-w32api.spec
index c4752a4..3cadcf6 100644 (file)
--- a/w32api/mingw-w32api.spec
+++ b/w32api/mingw-w32api.spec
@@ -1,8 +1,13 @@
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
+
+%define __strip %{_mingw_strip}
+%define __objdump %{_mingw_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw_findrequires}
+%define __find_provides %{_mingw_findprovides}
 
 Name:           mingw-w32api
 Version:       3.11
-Release:        1%{?dist}
+Release:        6%{?dist}
 Summary:        MinGW Windows cross-compiler Win32 header files
 
 License:        Public Domain
@@ -13,17 +18,19 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:     noarch
 
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-runtime
 
+Requires:       mingw-filesystem >= 23
 Requires:       mingw-binutils
 Requires:       mingw-gcc
 Requires:       mingw-runtime
 
 # Once this is installed, mingw-bootstrap (binary bootstrapper) is no
 # longer needed.
-Obsoletes:      mingw-bootstrap
+Obsoletes:      mingw-w32api-bootstrap
 
 #%define _use_internal_dependency_generator 0
 #%define __debug_install_post %{nil}
@@ -37,11 +44,9 @@ MinGW Windows cross-compiler Win32 header files.
 %setup -q -n w32api-%{version}
 
 %build
-#CFLAGS="-I%{_prefix}/i686-pc-mingw32/sys-root/mingw/include" \
-
 ./configure \
   --build=%_build \
-  --host=i686-pc-mingw32
+  --host=%{_mingw_host}
 
 make
 
@@ -49,7 +54,7 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make prefix=$RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw install
+make prefix=$RPM_BUILD_ROOT%{_mingw_prefix} install
 
 
 %clean
@@ -58,9 +63,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/*
+%{_mingw_includedir}/*
+%{_mingw_libdir}/*.a
+
 
 %changelog
-* Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 4.3.1-2
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11-6
+- Moved ole provides to mingw-filesystem package.
+
+* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11-3
+- Use the RPM macros from mingw-filesystem.
+
+* Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11-2
 - Initial RPM release, largely based on earlier work from several sources.