X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=filesystem%2Fmingw32-filesystem.spec;h=981a765bc9329d2f69b798ae2e607096b15a634b;hb=864a8706f9806998377baddf033b8284f6188798;hp=79e207a3882aaee75b4f79d19d91c02b5c28054e;hpb=125651316893857f6039271122b9eaa841c9b25d;p=fedora-mingw.git diff --git a/filesystem/mingw32-filesystem.spec b/filesystem/mingw32-filesystem.spec index 79e207a..981a765 100644 --- a/filesystem/mingw32-filesystem.spec +++ b/filesystem/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 26 +Version: 33 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -13,20 +13,35 @@ 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. -Provides: mingw32(msvcrt.dll) -Provides: mingw32(kernel32.dll) -Provides: mingw32(user32.dll) +# 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) +Provides: mingw32(mscoree.dll) +Provides: mingw32(msvcrt.dll) +Provides: mingw32(user32.dll) Obsoletes: mingw-filesystem = %{version}-%{release} Provides: mingw-filesystem < 26 @@ -56,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 @@ -109,15 +127,33 @@ 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 Sep 24 2008 Richard W.M. Jones - 26-1 +* Wed Oct 29 2008 Richard Jones - 33-1 +- Remove mingw32.{sh,csh} which are unused. + +* Mon Oct 27 2008 Richard Jones - 32-1 +- Add mingw32-configure script. + +* Mon Oct 27 2008 Richard Jones - 31-1 +- Update the spec file with explanation of the 'Provides: mingw32(...)' + lines for Windows system DLLs. + +* Mon Oct 6 2008 Richard Jones - 30-1 +- Added _mingw32_cxx. + +* Thu Sep 25 2008 Richard Jones - 29-1 +- Added _mingw32_as, _mingw32_dlltool, _mingw32_windres. + +* Wed Sep 24 2008 Richard W.M. Jones - 27-1 - Begin the grand renaming of mingw -> mingw32. +- Added mingw32(mscoree.dll). * Sun Sep 21 2008 Richard W.M. Jones - 25-1 - Add shared aclocal directory.