X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=filesystem%2Fmingw32-filesystem.spec;h=297d6cb51e9e9cb8c1c6bc04232ec25fb7073d2a;hb=455a61a915677ce532507385a91ce3280c26851c;hp=52fd7a58f3a4d900ad0faba0ba8fdc5ba5492294;hpb=bce5b966788b7d38e7235291e155272f1dc42d6a;p=fedora-mingw.git

diff --git a/filesystem/mingw32-filesystem.spec b/filesystem/mingw32-filesystem.spec
index 52fd7a5..297d6cb 100644
--- a/filesystem/mingw32-filesystem.spec
+++ b/filesystem/mingw32-filesystem.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           mingw32-filesystem
-Version:        30
+Version:        34
 Release:        1%{?dist}
 Summary:        MinGW base filesystem and environment
 
@@ -13,15 +13,29 @@ BuildArch:      noarch
 
 Source0:        mingw32-COPYING
 Source1:        mingw32-macros.mingw32
-Source2:        mingw32.sh
-Source3:        mingw32.csh
+#Source2:        mingw32.sh
+#Source3:        mingw32.csh
 Source4:        mingw32-find-requires.sh
 Source5:        mingw32-find-provides.sh
+Source6:        mingw32-configure.sh
 
 Requires:       setup
 Requires:       rpm
 
-# These are actually provided by Windows itself, or Wine.
+# Note about 'Provides: mingw32(foo.dll)'
+# ------------------------------------------------------------
+#
+# We want to be able to build & install mingw32 libraries without
+# necessarily needing to install wine.  (And certainly not needing to
+# install Windows!)  There is no requirement to have wine installed in
+# order to use the mingw toolchain to develop software (ie. to
+# compile more stuff on top of it), so why require that?
+#
+# So for expediency, this base package provides the "missing" DLLs
+# from Windows.  Another way to do it would be to exclude these
+# proprietary DLLs in our find-requires checking script - essentially
+# it comes out the same either way.
+#
 Provides:       mingw32(gdi32.dll)
 Provides:       mingw32(kernel32.dll)
 Provides:       mingw32(ole32.dll)
@@ -57,8 +71,11 @@ rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-install -m 644 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/mingw32-configure
+
+#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+#install -m 644 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.mingw32
@@ -110,13 +127,27 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/rpm/macros.mingw32
-%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh
-%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh
+#%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh
+#%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh
+%{_bindir}/mingw32-configure
 %{_prefix}/i686-pc-mingw32/
 /usr/lib/rpm/mingw32-*
 
 
 %changelog
+* Wed Oct 29 2008 Richard Jones <rjones@redhat.com> - 34-1
+- Set --prefix correctly.
+
+* Wed Oct 29 2008 Richard Jones <rjones@redhat.com> - 33-1
+- Remove mingw32.{sh,csh} which are unused.
+
+* Mon Oct 27 2008 Richard Jones <rjones@redhat.com> - 32-1
+- Add mingw32-configure script.
+
+* Mon Oct 27 2008 Richard Jones <rjones@redhat.com> - 31-1
+- Update the spec file with explanation of the 'Provides: mingw32(...)'
+  lines for Windows system DLLs.
+
 * Mon Oct  6 2008 Richard Jones <rjones@redhat.com> - 30-1
 - Added _mingw32_cxx.