%define debug_package %{nil}
Name: mingw-filesystem
-Version: 19
+Version: 25
Release: 1%{?dist}
Summary: MinGW base filesystem and environment
Source3: mingw.csh
Source4: mingw-find-requires.sh
Source5: mingw-find-provides.sh
-Source6: mingw-defs
Requires: setup
Requires: rpm
Provides: mingw(msvcrt.dll)
Provides: mingw(kernel32.dll)
Provides: mingw(user32.dll)
+Provides: mingw(gdi32.dll)
+Provides: mingw(ole32.dll)
%description
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
+
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal
+
+# 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.
-
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/rpm
-install -m 0755 mingw-find-requires.sh $RPM_BUILD_ROOT%{_libdir}/rpm
-install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/rpm
-install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/rpm
+# 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
%clean
%config(noreplace) %{_sysconfdir}/profile.d/mingw.sh
%config(noreplace) %{_sysconfdir}/profile.d/mingw.csh
%{_prefix}/i686-pc-mingw32/
-%{_libdir}/rpm/mingw-*
+/usr/lib/rpm/mingw-*
%changelog
-* Mon Sep 4 2008 Richard W.M. Jones <rjones@redhat.com> - 19-1
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 25-1
+- Add shared aclocal directory.
+
+* 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
+
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 22-1
+- Windows provides OLE32.DLL.
+
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 21-1
+- Allow '.' in dll names for find-requires
+- Windows provides GDI32.DLL.
+
+* Fri Sep 5 2008 Richard W.M. Jones <rjones@redhat.com> - 20-1
+- On 64 bit install in /usr/lib/rpm always.
+
+* Thu Sep 4 2008 Richard W.M. Jones <rjones@redhat.com> - 19-1
- 'user32.dll' is provided by Windows.
- Allow '-' in DLL names.
- More accurate detection of DLLs in requires/provides scripts.