From 87d478b1337b8710c484b3ae9fdf9dd11943ad26 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 1 Jan 1970 00:00:00 +0000
Subject: [PATCH] Add %{_mingw_infodir}. Improve the comments. Remove
 mingw-defs.

---
 filesystem/mingw-defs            |  8 --------
 filesystem/mingw-filesystem.spec | 28 +++++++++++++++++-----------
 filesystem/mingw-macros.mingw    |  1 +
 3 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 100644 filesystem/mingw-defs

diff --git a/filesystem/mingw-defs b/filesystem/mingw-defs
deleted file mode 100644
index 511e46a..0000000
--- a/filesystem/mingw-defs
+++ /dev/null
@@ -1,8 +0,0 @@
-# Some standard definitions %-included at the top of most
-# of the MinGW RPM spec files.
-
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
diff --git a/filesystem/mingw-filesystem.spec b/filesystem/mingw-filesystem.spec
index dd386e6..00e16e0 100644
--- a/filesystem/mingw-filesystem.spec
+++ b/filesystem/mingw-filesystem.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           mingw-filesystem
-Version:        23
+Version:        24
 Release:        1%{?dist}
 Summary:        MinGW base filesystem and environment
 
@@ -17,7 +17,6 @@ Source2:        mingw.sh
 Source3:        mingw.csh
 Source4:        mingw-find-requires.sh
 Source5:        mingw-find-provides.sh
-Source6:        mingw-defs
 
 Requires:       setup
 Requires:       rpm
@@ -69,29 +68,32 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/bin
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/lib
 
 # The MinGW system root which will contain Windows native binaries
-# and Windows-specific header files, man pages, pkgconfig, etc.
+# and Windows-specific header files, pkgconfig, etc.
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/doc
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/include
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/sys
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig
+
+# 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/i686-pc-mingw32/sys-root/mingw/man and
+#   /usr/i686-pc-mingw32/sys-root/mingw/doc
+# but those are both packaging bugs.
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/doc
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/info
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n}
 
-# Note that some packages try to install in
-# /usr/i686-pc-mingw32/sys-root/mingw/man and
-# /usr/i686-pc-mingw32/sys-root/mingw/doc
-# but these are both packaging bugs.
-
-# NB. NOT libdir
+# NB. NOT _libdir
 mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm
 install -m 0755 mingw-find-requires.sh $RPM_BUILD_ROOT/usr/lib/rpm
 install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm
-install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/usr/lib/rpm
 
 
 %clean
@@ -109,6 +111,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 24-1
+- Remove mingw-defs, since no longer used.
+- Add _mingw_infodir.
+
 * Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 23-1
 - Add macros for find-provides/requires scripts
 
diff --git a/filesystem/mingw-macros.mingw b/filesystem/mingw-macros.mingw
index c4010b3..ef2a671 100644
--- a/filesystem/mingw-macros.mingw
+++ b/filesystem/mingw-macros.mingw
@@ -9,6 +9,7 @@
 %_mingw_libexecdir        %{_mingw_prefix}/libexec
 %_mingw_datadir           %{_mingw_prefix}/share
 %_mingw_docdir            %{_mingw_prefix}/share/doc
+%_mingw_infodir           %{_mingw_prefix}/share/info
 %_mingw_mandir            %{_mingw_prefix}/share/man
 %_mingw_sysconfdir        %{_mingw_prefix}/etc
 %_mingw_includedir        %{_mingw_prefix}/include
-- 
1.8.3.1