smock: use $basearch in smock.mock.extra

[fedora-mingw.git] / mingw64-headers / mingw64-headers.spec

diff --git a/mingw64-headers/mingw64-headers.spec b/mingw64-headers/mingw64-headers.spec
index 6b27671..c03cb2a 100644 (file)
--- a/mingw64-headers/mingw64-headers.spec
+++ b/mingw64-headers/mingw64-headers.spec
@@ -5,8 +5,8 @@
 %define svn_revision 607
 
 Name:           mingw64-headers
-Version:       0.1
-Release:        0.svn%{svn_revision}.2%{?dist}
+Version:        0.1
+Release:        0.svn%{svn_revision}.10%{?dist}
 Summary:        Win32 header files and stubs
 
 License:        Public Domain and LGPLv2+
@@ -19,9 +19,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw64-filesystem >= 2
+BuildRequires:  mingw64-filesystem >= 10
 
-Requires:       mingw64-filesystem >= 2
+Requires:       mingw64-filesystem >= 10
 
 
 %description
@@ -45,16 +45,15 @@ find -name ChangeLog -delete
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_mingw64_includedir}
+# This is different from mingw32.  By default GCC 4.4 searches for
+# headers in these two directories:
+#   /usr/x86_64-pc-mingw32/include
+#   /usr/x86_64-pc-mingw32/sys-root/mingw/include64  (symlink to ./include)
 
-cp -a trunk/mingw-w64-headers/include/* $RPM_BUILD_ROOT%{_mingw64_includedir}/
-cp -a trunk/mingw-w64-headers/direct-x/include/* $RPM_BUILD_ROOT%{_mingw64_includedir}/
+mkdir -p $RPM_BUILD_ROOT%{_mingw64_includedir}
 
-# This link is a temporary hack to get builds working.  Eventually
-# upstream will sort this out so the link is no longer necessary.
-pushd $RPM_BUILD_ROOT%{_mingw64_sysroot}
-ln -s mingw %{_mingw64_target}
-popd
+cp -a trunk/mingw-w64-headers/include/* $RPM_BUILD_ROOT%{_mingw64_includedir}
+cp -a trunk/mingw-w64-headers/direct-x/include/* $RPM_BUILD_ROOT%{_mingw64_includedir}
 
 
 %clean
@@ -64,11 +63,10 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %{_mingw64_includedir}/*
-%{_mingw64_sysroot}/%{_mingw64_target}
 
 
 %changelog
-* Wed Feb 11 2009 Richard W.M. Jones <rjones@redhat.com> - 0.1-0.svn607.2
+* Wed Feb 11 2009 Richard W.M. Jones <rjones@redhat.com> - 0.1-0.svn607.10
 - Started mingw64 development.
 
 * Mon Dec 15 2008 Richard W.M. Jones <rjones@redhat.com> - 3.13-1