X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=mingw64-filesystem%2Fmingw64-filesystem.spec;h=1e2e7a3a8eade5a2c54a7bd0bf5005e29cf63e37;hb=5643de2c0101e8ef14d852d78780fdcffbf3e106;hp=c2f1df3e6e3a9c452fcd41596fdb210518eb1b12;hpb=e512d7de08f15b1e3a88b24f85a698928ac1ea67;p=fedora-mingw.git

diff --git a/mingw64-filesystem/mingw64-filesystem.spec b/mingw64-filesystem/mingw64-filesystem.spec
index c2f1df3..1e2e7a3 100644
--- a/mingw64-filesystem/mingw64-filesystem.spec
+++ b/mingw64-filesystem/mingw64-filesystem.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           mingw64-filesystem
-Version:        2
+Version:        10
 Release:        1%{?dist}
 Summary:        MinGW base filesystem and environment
 
@@ -89,36 +89,45 @@ install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/
 
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32
 
-# GCC requires these directories, even though they contain links
-# to binaries which are also installed in /usr/bin etc.  These
-# contain Fedora native binaries.
+# These directories are used by GCC for cross-compilation.
+# NOTE different contents from mingw32.
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/bin
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/lib
 
-# The MinGW system root which will contain Windows native binaries
+# The system root which will contain Windows native binaries
 # and Windows-specific header files, pkgconfig, etc.
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/include
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/include/sys
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/lib
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/lib/pkgconfig
-
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/share/aclocal
+# NOTE different from mingw32.
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/bin
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/include
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/include/sys
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/lib
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/lib/pkgconfig
+
+# GCC wants to look in include64/ directory for some reason.
+pushd $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root
+ln -s include include64
+popd
 
 # We don't normally package manual pages and info files, except
 # where those are not supplied by a Fedora native package.  So we
 # need to create the directories.
 #
 # Note that some packages try to install stuff in
-#   /usr/x86_64-pc-mingw32/sys-root/mingw/man and
-#   /usr/x86_64-pc-mingw32/sys-root/mingw/doc
+#   /usr/x86_64-pc-mingw32/sys-root/man and
+#   /usr/x86_64-pc-mingw32/sys-root/doc
 # but those are both packaging bugs.
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/share
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/share/doc
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/share/info
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/share/man
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n}
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/share
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/share/doc
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/share/info
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/share/man
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/share/man/man{1,2,3,4,5,6,7,8,l,n}
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root/share/aclocal
+
+pushd $RPM_BUILD_ROOT%{_prefix}/x86_64-pc-mingw32/sys-root
+ln -s . mingw
+popd
+
 
 # NB. NOT _libdir
 mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm
@@ -145,7 +154,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Feb 11 2009 Richard W.M. Jones <rjones@redhat.com> - 2-1
+* Wed Feb 11 2009 Richard W.M. Jones <rjones@redhat.com> - 10-1
 - Start mingw64 development.
 
 * Sun Feb  1 2009 Richard W.M. Jones <rjones@redhat.com> - 46-1