From 125651316893857f6039271122b9eaa841c9b25d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Jan 1970 00:00:00 +0000 Subject: [PATCH 1/1] Rename base packages mingw -> mingw32. --- README | 20 ++--- .../{mingw-binutils.spec => mingw32-binutils.spec} | 27 ++++--- build-everything-in-mock.sh | 2 +- filesystem/mingw-macros.mingw | 41 ----------- filesystem/{mingw-COPYING => mingw32-COPYING} | 0 ...ngw-filesystem.spec => mingw32-filesystem.spec} | 46 +++++++----- ...w-find-provides.sh => mingw32-find-provides.sh} | 2 +- ...w-find-requires.sh => mingw32-find-requires.sh} | 12 +-- filesystem/mingw32-macros.mingw32 | 41 +++++++++++ filesystem/{mingw.csh => mingw32.csh} | 0 filesystem/{mingw.sh => mingw32.sh} | 0 ...ngw-gcc-build.patch => mingw32-gcc-build.patch} | 0 gcc/{mingw-gcc.spec => mingw32-gcc.spec} | 40 +++++----- ...otstrap.spec => mingw32-runtime-bootstrap.spec} | 8 +- runtime/mingw-runtime.spec | 80 -------------------- runtime/mingw32-runtime.spec | 86 ++++++++++++++++++++++ show-build-order.pl | 44 +++++------ ...ootstrap.spec => mingw32-w32api-bootstrap.spec} | 8 +- w32api/{mingw-w32api.spec => mingw32-w32api.spec} | 46 ++++++------ 19 files changed, 270 insertions(+), 233 deletions(-) rename binutils/{mingw-binutils.spec => mingw32-binutils.spec} (69%) delete mode 100644 filesystem/mingw-macros.mingw rename filesystem/{mingw-COPYING => mingw32-COPYING} (100%) rename filesystem/{mingw-filesystem.spec => mingw32-filesystem.spec} (83%) rename filesystem/{mingw-find-provides.sh => mingw32-find-provides.sh} (93%) rename filesystem/{mingw-find-requires.sh => mingw32-find-requires.sh} (62%) create mode 100644 filesystem/mingw32-macros.mingw32 rename filesystem/{mingw.csh => mingw32.csh} (100%) rename filesystem/{mingw.sh => mingw32.sh} (100%) rename gcc/{mingw-gcc-build.patch => mingw32-gcc-build.patch} (100%) rename gcc/{mingw-gcc.spec => mingw32-gcc.spec} (86%) rename runtime-bootstrap/{mingw-runtime-bootstrap.spec => mingw32-runtime-bootstrap.spec} (85%) delete mode 100644 runtime/mingw-runtime.spec create mode 100644 runtime/mingw32-runtime.spec rename w32api-bootstrap/{mingw-w32api-bootstrap.spec => mingw32-w32api-bootstrap.spec} (85%) rename w32api/{mingw-w32api.spec => mingw32-w32api.spec} (54%) diff --git a/README b/README index 7544230..43df4ab 100644 --- a/README +++ b/README @@ -25,37 +25,37 @@ Build everything Package notes ---------------------------------------------------------------------- - ( 1) mingw-filesystem + ( 1) mingw32-filesystem This is the base package containing the filesystem, RPM macros and other stuff that everything depends on. This is a pure Fedora RPM with no outside dependencies. - ( 2) mingw-binutils + ( 2) mingw32-binutils This is just a straight cross-compile of binutils. It has no BuildRequires beyond what is in basic Fedora already. - ( 3) mingw-runtime-bootstrap - ( 4) mingw-w32api-bootstrap + ( 3) mingw32-runtime-bootstrap + ( 4) mingw32-w32api-bootstrap These are NOT real Fedora packages. Instead they are BINARY packages which is just needed first time if you are building from scratch. It contains some Windows binaries and header files which are needed to bootstrap everything, and which would normally be built by the packages below (specifically - by mingw-runtime and mingw-w32api). + by mingw32-runtime and mingw32-w32api). - Note: If you already have mingw packages installed then you + Note: If you already have MinGW packages installed then you should not build this package. - ( 5) mingw-gcc + ( 5) mingw32-gcc - ( 6) mingw-runtime - ( 7) mingw-w32api + ( 6) mingw32-runtime + ( 7) mingw32-w32api Note that once built and installed, these last two replace the - files built from binaries in mingw-{runtime,w32api}-bootstrap. + files built from binaries in mingw32-{runtime,w32api}-bootstrap. Then for the rest, use ./show-build-order.pl which is a script which works out the correct order to build packages and will display the diff --git a/binutils/mingw-binutils.spec b/binutils/mingw32-binutils.spec similarity index 69% rename from binutils/mingw-binutils.spec rename to binutils/mingw32-binutils.spec index 27d58d2..6179f3c 100644 --- a/binutils/mingw-binutils.spec +++ b/binutils/mingw32-binutils.spec @@ -1,24 +1,27 @@ %define binutils_version 2.18.50 -%define mingw_binutils_version 20080109-2 -%define mingw_binutils_rpmvers %{expand:%(echo %{mingw_binutils_version} | tr - _)} +%define mingw32_binutils_version 20080109-2 +%define mingw32_binutils_rpmvers %{expand:%(echo %{mingw32_binutils_version} | tr - _)} -Name: mingw-binutils -Version: %{binutils_version}_%{mingw_binutils_rpmvers} -Release: 7%{?dist} +Name: mingw32-binutils +Version: %{binutils_version}_%{mingw32_binutils_rpmvers} +Release: 8%{?dist} Summary: MinGW Windows binutils License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+ Group: Development/Libraries URL: http://www.mingw.org/ -Source0: http://dl.sourceforge.net/sourceforge/mingw/binutils-%{binutils_version}-%{mingw_binutils_version}-src.tar.gz +Source0: http://dl.sourceforge.net/sourceforge/mingw/binutils-%{binutils_version}-%{mingw32_binutils_version}-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex BuildRequires: bison BuildRequires: texinfo -BuildRequires: mingw-filesystem >= 2 +BuildRequires: mingw32-filesystem >= 26 -Requires: mingw-filesystem >= 2 +Requires: mingw32-filesystem >= 26 + +Provides: mingw-binutils = %{version}-%{release} +Obsoletes: mingw-binutils < 2.18.50_20080109_2-8 %description @@ -36,12 +39,12 @@ cd build CFLAGS="$RPM_OPT_FLAGS" \ ../configure \ --build=%_build --host=%_host \ - --target=%{_mingw_target} \ + --target=%{_mingw32_target} \ --verbose --disable-nls \ --without-included-gettext \ --disable-win32-registry \ --disable-werror \ - --with-sysroot=%{_mingw_sysroot} \ + --with-sysroot=%{_mingw32_sysroot} \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} @@ -73,6 +76,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 24 2008 Richard W.M. Jones - 2.18.50_20080109_2-8 +- Rename mingw -> mingw32. +- BR mingw32-filesystem >= 26. + * Thu Sep 4 2008 Richard W.M. Jones - 2.18.50_20080109_2-7 - Use mingw-filesystem. diff --git a/build-everything-in-mock.sh b/build-everything-in-mock.sh index a644ae5..e8bdec3 100755 --- a/build-everything-in-mock.sh +++ b/build-everything-in-mock.sh @@ -10,7 +10,7 @@ export DIST SKIP_BUILT_SRPMS LOCALREPO ARCHES specs=`perl show-build-order.pl | grep -v '^#' | - grep -Eo '[^[:space:]]+/mingw-[^[:space:]]+\.spec'` + grep -Eo '[^[:space:]]+/mingw32-[^[:space:]]+\.spec'` rm -f buildall.log echo -e "Specfiles in build order:\n$specs\n\n" >> buildall.log diff --git a/filesystem/mingw-macros.mingw b/filesystem/mingw-macros.mingw deleted file mode 100644 index ef2a671..0000000 --- a/filesystem/mingw-macros.mingw +++ /dev/null @@ -1,41 +0,0 @@ -# RPM macros for Fedora MinGW. - -# Paths. -%_mingw_sysroot %{_prefix}/i686-pc-mingw32/sys-root -%_mingw_prefix %{_mingw_sysroot}/mingw -%_mingw_bindir %{_mingw_prefix}/bin -%_mingw_sbindir %{_mingw_prefix}/sbin -%_mingw_libdir %{_mingw_prefix}/lib -%_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 - -# Build macros. -%_mingw_host i686-pc-mingw32 -%_mingw_target i686-pc-mingw32 - -%_mingw_cflags -O2 -g -pipe -Wall \\\ - -Wp,-D_FORTIFY_SOURCE=2 \\\ - -fexceptions \\\ - --param=ssp-buffer-size=4 - -%_mingw_cc i686-pc-mingw32-gcc -%_mingw_cpp i686-pc-mingw32-gcc -E -%_mingw_ar i686-pc-mingw32-ar -%_mingw_ranlib i686-pc-mingw32-ranlib -%_mingw_strip i686-pc-mingw32-strip -%_mingw_objdump i686-pc-mingw32-objdump -%_mingw_findprovides /usr/lib/rpm/mingw-find-provides.sh -%_mingw_findrequires /usr/lib/rpm/mingw-find-requires.sh - -%_mingw_configure \ - PKG_CONFIG_PATH="%{_mingw_libdir}/pkgconfig" \\\ - CC="%{_mingw_cc}" \\\ - CFLAGS="%{_mingw_cflags}" \\\ - ./configure \\\ - --build=%_build --host=%{_mingw_host} --target=%{_mingw_target} \\\ - --prefix=%{_mingw_prefix} diff --git a/filesystem/mingw-COPYING b/filesystem/mingw32-COPYING similarity index 100% rename from filesystem/mingw-COPYING rename to filesystem/mingw32-COPYING diff --git a/filesystem/mingw-filesystem.spec b/filesystem/mingw32-filesystem.spec similarity index 83% rename from filesystem/mingw-filesystem.spec rename to filesystem/mingw32-filesystem.spec index a2e0fb1..79e207a 100644 --- a/filesystem/mingw-filesystem.spec +++ b/filesystem/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} -Name: mingw-filesystem -Version: 25 +Name: mingw32-filesystem +Version: 26 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -11,22 +11,25 @@ URL: http://hg.et.redhat.com/misc/fedora-mingw--devel/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Source0: mingw-COPYING -Source1: mingw-macros.mingw -Source2: mingw.sh -Source3: mingw.csh -Source4: mingw-find-requires.sh -Source5: mingw-find-provides.sh +Source0: mingw32-COPYING +Source1: mingw32-macros.mingw32 +Source2: mingw32.sh +Source3: mingw32.csh +Source4: mingw32-find-requires.sh +Source5: mingw32-find-provides.sh Requires: setup Requires: rpm # These are actually provided by Windows itself, or Wine. -Provides: mingw(msvcrt.dll) -Provides: mingw(kernel32.dll) -Provides: mingw(user32.dll) -Provides: mingw(gdi32.dll) -Provides: mingw(ole32.dll) +Provides: mingw32(msvcrt.dll) +Provides: mingw32(kernel32.dll) +Provides: mingw32(user32.dll) +Provides: mingw32(gdi32.dll) +Provides: mingw32(ole32.dll) + +Obsoletes: mingw-filesystem = %{version}-%{release} +Provides: mingw-filesystem < 26 %description @@ -41,7 +44,7 @@ This environment is maintained by the Fedora MinGW SIG at: %prep %setup -q -c -T cp %{SOURCE0} COPYING -sed 's/@VERSION@/%{version}/' < %{SOURCE4} > mingw-find-requires.sh +sed 's/@VERSION@/%{version}/' < %{SOURCE4} > mingw32-find-requires.sh %build @@ -57,7 +60,7 @@ 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.mingw +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.mingw32 mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32 @@ -94,7 +97,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man{ # 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 mingw32-find-requires.sh $RPM_BUILD_ROOT/usr/lib/rpm install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm @@ -105,14 +108,17 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING -%config(noreplace) %{_sysconfdir}/rpm/macros.mingw -%config(noreplace) %{_sysconfdir}/profile.d/mingw.sh -%config(noreplace) %{_sysconfdir}/profile.d/mingw.csh +%config(noreplace) %{_sysconfdir}/rpm/macros.mingw32 +%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh +%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh %{_prefix}/i686-pc-mingw32/ -/usr/lib/rpm/mingw-* +/usr/lib/rpm/mingw32-* %changelog +* Wed Sep 24 2008 Richard W.M. Jones - 26-1 +- Begin the grand renaming of mingw -> mingw32. + * Sun Sep 21 2008 Richard W.M. Jones - 25-1 - Add shared aclocal directory. diff --git a/filesystem/mingw-find-provides.sh b/filesystem/mingw32-find-provides.sh similarity index 93% rename from filesystem/mingw-find-provides.sh rename to filesystem/mingw32-find-provides.sh index eba2243..966360b 100755 --- a/filesystem/mingw-find-provides.sh +++ b/filesystem/mingw32-find-provides.sh @@ -16,5 +16,5 @@ dlls=$(echo $filelist | tr [:blank:] '\n' | grep '\.dll$') for f in $dlls; do basename=`basename $f | tr [:upper:] [:lower:]` - echo "mingw($basename)" + echo "mingw32($basename)" done diff --git a/filesystem/mingw-find-requires.sh b/filesystem/mingw32-find-requires.sh similarity index 62% rename from filesystem/mingw-find-requires.sh rename to filesystem/mingw32-find-requires.sh index 6b9848a..ff8bb39 100755 --- a/filesystem/mingw-find-requires.sh +++ b/filesystem/mingw32-find-requires.sh @@ -14,15 +14,15 @@ fi filelist=`sed "s/['\"]/\\\&/g"` -# Everything requires mingw-filesystem of at least the current version -# and mingw-runtime. -echo 'mingw-filesystem >= @VERSION@' -echo 'mingw-runtime' +# Everything requires mingw32-filesystem of at least the current version +# and mingw32-runtime. +echo 'mingw32-filesystem >= @VERSION@' +echo 'mingw32-runtime' -dlls=$(echo $filelist | tr [:blank:] '\n' | grep '\.dll$') +dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$') for f in $dlls; do $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._[:alnum:]]+\.dll' | tr [:upper:] [:lower:] | - sed 's/\(.*\)/mingw(\1)/' + sed 's/\(.*\)/mingw32(\1)/' done | sort -u diff --git a/filesystem/mingw32-macros.mingw32 b/filesystem/mingw32-macros.mingw32 new file mode 100644 index 0000000..0d0b0bd --- /dev/null +++ b/filesystem/mingw32-macros.mingw32 @@ -0,0 +1,41 @@ +# RPM macros for Fedora MinGW. + +# Paths. +%_mingw32_sysroot %{_prefix}/i686-pc-mingw32/sys-root +%_mingw32_prefix %{_mingw32_sysroot}/mingw +%_mingw32_bindir %{_mingw32_prefix}/bin +%_mingw32_sbindir %{_mingw32_prefix}/sbin +%_mingw32_libdir %{_mingw32_prefix}/lib +%_mingw32_libexecdir %{_mingw32_prefix}/libexec +%_mingw32_datadir %{_mingw32_prefix}/share +%_mingw32_docdir %{_mingw32_prefix}/share/doc +%_mingw32_infodir %{_mingw32_prefix}/share/info +%_mingw32_mandir %{_mingw32_prefix}/share/man +%_mingw32_sysconfdir %{_mingw32_prefix}/etc +%_mingw32_includedir %{_mingw32_prefix}/include + +# Build macros. +%_mingw32_host i686-pc-mingw32 +%_mingw32_target i686-pc-mingw32 + +%_mingw32_cflags -O2 -g -pipe -Wall \\\ + -Wp,-D_FORTIFY_SOURCE=2 \\\ + -fexceptions \\\ + --param=ssp-buffer-size=4 + +%_mingw32_cc i686-pc-mingw32-gcc +%_mingw32_cpp i686-pc-mingw32-gcc -E +%_mingw32_ar i686-pc-mingw32-ar +%_mingw32_ranlib i686-pc-mingw32-ranlib +%_mingw32_strip i686-pc-mingw32-strip +%_mingw32_objdump i686-pc-mingw32-objdump +%_mingw32_findprovides /usr/lib/rpm/mingw32-find-provides.sh +%_mingw32_findrequires /usr/lib/rpm/mingw32-find-requires.sh + +%_mingw32_configure \ + PKG_CONFIG_PATH="%{_mingw32_libdir}/pkgconfig" \\\ + CC="%{_mingw32_cc}" \\\ + CFLAGS="%{_mingw32_cflags}" \\\ + ./configure \\\ + --build=%_build --host=%{_mingw32_host} --target=%{_mingw32_target} \\\ + --prefix=%{_mingw32_prefix} diff --git a/filesystem/mingw.csh b/filesystem/mingw32.csh similarity index 100% rename from filesystem/mingw.csh rename to filesystem/mingw32.csh diff --git a/filesystem/mingw.sh b/filesystem/mingw32.sh similarity index 100% rename from filesystem/mingw.sh rename to filesystem/mingw32.sh diff --git a/gcc/mingw-gcc-build.patch b/gcc/mingw32-gcc-build.patch similarity index 100% rename from gcc/mingw-gcc-build.patch rename to gcc/mingw32-gcc-build.patch diff --git a/gcc/mingw-gcc.spec b/gcc/mingw32-gcc.spec similarity index 86% rename from gcc/mingw-gcc.spec rename to gcc/mingw32-gcc.spec index b60cfa4..67fbeeb 100644 --- a/gcc/mingw-gcc.spec +++ b/gcc/mingw32-gcc.spec @@ -1,8 +1,8 @@ %define __os_install_post /usr/lib/rpm/brp-compress %{nil} -Name: mingw-gcc +Name: mingw32-gcc Version: 4.3.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: MinGW Windows cross-compiler (GCC) for C License: GPLv2+ @@ -14,30 +14,33 @@ Patch1: %{name}-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: texinfo -BuildRequires: mingw-filesystem >= 2 -BuildRequires: mingw-binutils -BuildRequires: mingw-runtime -BuildRequires: mingw-w32api +BuildRequires: mingw32-filesystem >= 26 +BuildRequires: mingw32-binutils +BuildRequires: mingw32-runtime +BuildRequires: mingw32-w32api BuildRequires: gmp-devel BuildRequires: mpfr-devel BuildRequires: libgomp -Requires: mingw-filesystem >= 2 -Requires: mingw-binutils -Requires: mingw-runtime -Requires: mingw-w32api -Requires: mingw-cpp +Requires: mingw32-filesystem >= 26 +Requires: mingw32-binutils +Requires: mingw32-runtime +Requires: mingw32-w32api +Requires: mingw32-cpp + +Provides: mingw-gcc = %{version}-%{release} +Obsoletes: mingw-gcc < 4.3.2-7 %description MinGW Windows cross-compiler (GCC) for C -%package -n mingw-cpp +%package -n mingw32-cpp Summary: MinGW Windows cross-C Preprocessor. Group: Development/Languages -%description -n mingw-cpp +%description -n mingw32-cpp MinGW Windows cross-C Preprocessor @@ -72,7 +75,7 @@ CC="%{__cc} ${RPM_OPT_FLAGS}" \ --infodir=%{_infodir} \ --datadir=%{_datadir} \ --build=%_build --host=%_host \ - --target=%{_mingw_target} \ + --target=%{_mingw32_target} \ --with-gnu-as --with-gnu-ld --verbose \ --without-newlib \ --disable-multilib \ @@ -80,7 +83,7 @@ CC="%{__cc} ${RPM_OPT_FLAGS}" \ --disable-nls --without-included-gettext \ --disable-win32-registry \ --enable-version-specific-runtime-libs \ - --with-sysroot=%{_mingw_sysroot} \ + --with-sysroot=%{_mingw32_sysroot} \ --enable-languages="$languages" $optargs make all @@ -99,7 +102,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty* rm -f $RPM_BUILD_ROOT%{_mandir}/man7/* mkdir -p $RPM_BUILD_ROOT/lib -ln -sf ..%{_prefix}/bin/i686-pc-mingw-cpp \ +ln -sf ..%{_prefix}/bin/i686-pc-mingw32-cpp \ $RPM_BUILD_ROOT/lib/i686-pc-mingw32-cpp %clean @@ -139,7 +142,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/i686-pc-mingw32-gcov.1* -%files -n mingw-cpp +%files -n mingw32-cpp %defattr(-,root,root) /lib/i686-pc-mingw32-cpp %{_bindir}/i686-pc-mingw32-cpp @@ -164,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 4 2008 Richard W.M. Jones - 4.3.1-7 +- Rename mingw -> mingw32. + * Thu Sep 4 2008 Richard W.M. Jones - 4.3.1-6 - Use RPM macros from mingw-filesystem. diff --git a/runtime-bootstrap/mingw-runtime-bootstrap.spec b/runtime-bootstrap/mingw32-runtime-bootstrap.spec similarity index 85% rename from runtime-bootstrap/mingw-runtime-bootstrap.spec rename to runtime-bootstrap/mingw32-runtime-bootstrap.spec index c83fdc5..4893c32 100644 --- a/runtime-bootstrap/mingw-runtime-bootstrap.spec +++ b/runtime-bootstrap/mingw32-runtime-bootstrap.spec @@ -5,9 +5,9 @@ %define runtime_version 3.14 -Name: mingw-runtime-bootstrap +Name: mingw32-runtime-bootstrap Version: 1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows bootstrap (binary package) Group: Development/Libraries @@ -20,6 +20,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +Provides: mingw32-runtime = %{runtime_version} Provides: mingw-runtime = %{runtime_version} @@ -56,5 +57,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 24 2008 Richard W.M. Jones - 1-4 +- Rename mingw -> mingw32. + * Mon Jul 7 2008 Richard W.M. Jones - 1-3 - Initial RPM release. diff --git a/runtime/mingw-runtime.spec b/runtime/mingw-runtime.spec deleted file mode 100644 index 4cddf3b..0000000 --- a/runtime/mingw-runtime.spec +++ /dev/null @@ -1,80 +0,0 @@ - -%define __strip %{_mingw_strip} -%define __objdump %{_mingw_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw_findrequires} -%define __find_provides %{_mingw_findprovides} - -Name: mingw-runtime -Version: 3.14 -Release: 4%{?dist} -Summary: MinGW Windows cross-compiler runtime and root filesystem - -License: Public Domain -Group: Development/Libraries -URL: http://www.mingw.org/ -Source0: http://dl.sourceforge.net/sourceforge/mingw/%{name}-%{version}-src.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildArch: noarch - -BuildRequires: mingw-filesystem >= 23 -BuildRequires: mingw-binutils -BuildRequires: mingw-gcc - -Requires: mingw-filesystem >= 23 -Requires: mingw-binutils -Requires: mingw-gcc - -# Once this is installed, mingw-bootstrap (binary bootstrapper) is no -# longer needed. -Obsoletes: mingw-runtime-bootstrap - - -%description -MinGW Windows cross-compiler runtime, base libraries. - - -%prep -%setup -q - -%build -CFLAGS="-I%{_mingw_includedir}" \ -./configure \ - --build=%_build \ - --host=%{_mingw_host} - -make - - -%install -rm -rf $RPM_BUILD_ROOT - -make prefix=$RPM_BUILD_ROOT%{_mingw_prefix} install - -# make install places these in nonstandard locations, so move them. -mkdir -p $RPM_BUILD_ROOT%{_mingw_docdir} -mv $RPM_BUILD_ROOT%{_mingw_prefix}/doc/* $RPM_BUILD_ROOT%{_mingw_docdir}/ -mkdir -p $RPM_BUILD_ROOT%{_mingw_mandir} -mv $RPM_BUILD_ROOT%{_mingw_prefix}/man/* $RPM_BUILD_ROOT%{_mingw_mandir}/ - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root) -%{_mingw_bindir}/* -%{_mingw_docdir}/* -%{_mingw_includedir}/* -%{_mingw_libdir}/* -%{_mingw_mandir}/man3/* - - -%changelog -* Thu Sep 4 2008 Richard W.M. Jones - 3.14-4 -- Use RPM macros from mingw-filesystem. - -* Mon Jul 7 2008 Richard W.M. Jones - 3.14-2 -- Initial RPM release, largely based on earlier work from several sources. diff --git a/runtime/mingw32-runtime.spec b/runtime/mingw32-runtime.spec new file mode 100644 index 0000000..62e55c6 --- /dev/null +++ b/runtime/mingw32-runtime.spec @@ -0,0 +1,86 @@ +%define __strip %{_mingw32_strip} +%define __objdump %{_mingw32_objdump} +%define _use_internal_dependency_generator 0 +%define __find_requires %{_mingw32_findrequires} +%define __find_provides %{_mingw32_findprovides} + +Name: mingw32-runtime +Version: 3.14 +Release: 5%{?dist} +Summary: MinGW Windows cross-compiler runtime and root filesystem + +License: Public Domain +Group: Development/Libraries +URL: http://www.mingw.org/ +Source0: http://dl.sourceforge.net/sourceforge/mingw/%{name}-%{version}-src.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch + +BuildRequires: mingw32-filesystem >= 26 +BuildRequires: mingw32-binutils +BuildRequires: mingw32-gcc + +Requires: mingw32-filesystem >= 26 +Requires: mingw32-binutils +Requires: mingw32-gcc + +# Once this is installed, mingw32-bootstrap (binary bootstrapper) is no +# longer needed. +Obsoletes: mingw32-runtime-bootstrap +Obsoletes: mingw-runtime-bootstrap + +Provides: mingw-runtime = %{version}-%{release} +Obsoletes: mingw-runtime < 3.14-5 + + +%description +MinGW Windows cross-compiler runtime, base libraries. + + +%prep +%setup -q + +%build +CFLAGS="-I%{_mingw32_includedir}" \ +./configure \ + --build=%_build \ + --host=%{_mingw32_host} + +make + + +%install +rm -rf $RPM_BUILD_ROOT + +make prefix=$RPM_BUILD_ROOT%{_mingw32_prefix} install + +# make install places these in nonstandard locations, so move them. +mkdir -p $RPM_BUILD_ROOT%{_mingw32_docdir} +mv $RPM_BUILD_ROOT%{_mingw32_prefix}/doc/* $RPM_BUILD_ROOT%{_mingw32_docdir}/ +mkdir -p $RPM_BUILD_ROOT%{_mingw32_mandir} +mv $RPM_BUILD_ROOT%{_mingw32_prefix}/man/* $RPM_BUILD_ROOT%{_mingw32_mandir}/ + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root) +%{_mingw32_bindir}/* +%{_mingw32_docdir}/* +%{_mingw32_includedir}/* +%{_mingw32_libdir}/* +%{_mingw32_mandir}/man3/* + + +%changelog +* Wed Sep 24 2008 Richard W.M. Jones - 3.14-5 +- Rename mingw -> mingw32. + +* Thu Sep 4 2008 Richard W.M. Jones - 3.14-4 +- Use RPM macros from mingw-filesystem. + +* Mon Jul 7 2008 Richard W.M. Jones - 3.14-2 +- Initial RPM release, largely based on earlier work from several sources. diff --git a/show-build-order.pl b/show-build-order.pl index a922111..3235235 100755 --- a/show-build-order.pl +++ b/show-build-order.pl @@ -54,17 +54,17 @@ sub main { } # Some packages we want to ignore for now. - delete $br{"mingw-cyrus-sasl"}; - delete $br{"mingw-nsis"}; - delete $br{"mingw-wix"}; - delete $br{"mingw-example"}; - delete $br{"mingw-gdb"}; + delete $br{"mingw32-cyrus-sasl"}; + delete $br{"mingw32-nsis"}; + delete $br{"mingw32-wix"}; + delete $br{"mingw32-example"}; + delete $br{"mingw32-gdb"}; # There is a dependency loop (gcc -> runtime/w32api -> gcc) # which has to be manually resolved below. Break that loop. - my @gcc_brs = @{$br{"mingw-gcc"}}; - @gcc_brs = grep { $_ ne "mingw-runtime" && $_ ne "mingw-w32api" } @gcc_brs; - $br{"mingw-gcc"} = \@gcc_brs; + my @gcc_brs = @{$br{"mingw32-gcc"}}; + @gcc_brs = grep { $_ ne "mingw32-runtime" && $_ ne "mingw32-w32api" } @gcc_brs; + $br{"mingw32-gcc"} = \@gcc_brs; # Use tsort to generate a topological ordering. open TSORT,">/tmp/tsort.tmp" or die "/tmp/tsort.tmp: $!"; @@ -91,7 +91,7 @@ sub main { while () { chomp; - if (/^mingw-(.*)/) { + if (/^mingw32-(.*)/) { $packagename = $_; my $dirname = $1; @@ -108,17 +108,17 @@ sub main { } } - # Special case for mingw-gcc deps. - if ($packagename eq "mingw-gcc" && - (!rpm_installed ("mingw-runtime") || - !rpm_installed ("mingw-w32api"))) { - print "rpmbuild -ba --define \"_sourcedir $pwd/runtime-bootstrap\" runtime-bootstrap/mingw-runtime-bootstrap.spec\n"; - print "# as root: rpm -Uvh mingw-runtime-bootstrap*.rpm\n"; - $installed{"mingw-runtime-bootstrap"} = 1; - - print "rpmbuild -ba --define \"_sourcedir $pwd/w32api-bootstrap\" w32api-bootstrap/mingw-w32api-bootstrap.spec\n"; - print "# as root: rpm -Uvh mingw-w32api-bootstrap*.rpm\n"; - $installed{"mingw-w32api-bootstrap"} = 1; + # Special case for mingw32-gcc deps. + if ($packagename eq "mingw32-gcc" && + (!rpm_installed ("mingw32-runtime") || + !rpm_installed ("mingw32-w32api"))) { + print "rpmbuild -ba --define \"_sourcedir $pwd/runtime-bootstrap\" runtime-bootstrap/mingw32-runtime-bootstrap.spec\n"; + print "# as root: rpm -Uvh mingw32-runtime-bootstrap*.rpm\n"; + $installed{"mingw32-runtime-bootstrap"} = 1; + + print "rpmbuild -ba --define \"_sourcedir $pwd/w32api-bootstrap\" w32api-bootstrap/mingw32-w32api-bootstrap.spec\n"; + print "# as root: rpm -Uvh mingw32-w32api-bootstrap*.rpm\n"; + $installed{"mingw32-w32api-bootstrap"} = 1; } # Spec file. @@ -163,8 +163,8 @@ sub remove_trailers { s/-devel$//; s/-doc$//; - # mingw-gcc-c++ etc. - s/^mingw-gcc-.*/mingw-gcc/; + # mingw32-gcc-c++ etc. + s/^mingw32-gcc-.*/mingw32-gcc/; return $_; } diff --git a/w32api-bootstrap/mingw-w32api-bootstrap.spec b/w32api-bootstrap/mingw32-w32api-bootstrap.spec similarity index 85% rename from w32api-bootstrap/mingw-w32api-bootstrap.spec rename to w32api-bootstrap/mingw32-w32api-bootstrap.spec index 2194f47..af4a243 100644 --- a/w32api-bootstrap/mingw-w32api-bootstrap.spec +++ b/w32api-bootstrap/mingw32-w32api-bootstrap.spec @@ -5,9 +5,9 @@ %define w32api_version 3.11 -Name: mingw-w32api-bootstrap +Name: mingw32-w32api-bootstrap Version: 1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows bootstrap (binary package) Group: Development/Libraries @@ -20,6 +20,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +Provides: mingw32-w32api = %{w32api_version} Provides: mingw-w32api = %{w32api_version} @@ -56,5 +57,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 24 2008 Richard W.M. Jones - 1-4 +- Rename mingw -> mingw32. + * Mon Jul 7 2008 Richard W.M. Jones - 1-3 - Initial RPM release. diff --git a/w32api/mingw-w32api.spec b/w32api/mingw32-w32api.spec similarity index 54% rename from w32api/mingw-w32api.spec rename to w32api/mingw32-w32api.spec index 1f00c0d..915c6f7 100644 --- a/w32api/mingw-w32api.spec +++ b/w32api/mingw32-w32api.spec @@ -1,12 +1,12 @@ -%define __strip %{_mingw_strip} -%define __objdump %{_mingw_objdump} +%define __strip %{_mingw32_strip} +%define __objdump %{_mingw32_objdump} %define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw_findrequires} -%define __find_provides %{_mingw_findprovides} +%define __find_requires %{_mingw32_findrequires} +%define __find_provides %{_mingw32_findprovides} -Name: mingw-w32api +Name: mingw32-w32api Version: 3.11 -Release: 6%{?dist} +Release: 7%{?dist} Summary: MinGW Windows cross-compiler Win32 header files License: Public Domain @@ -17,22 +17,23 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: mingw-filesystem >= 23 -BuildRequires: mingw-binutils -BuildRequires: mingw-gcc -BuildRequires: mingw-runtime +BuildRequires: mingw32-filesystem >= 23 +BuildRequires: mingw32-binutils +BuildRequires: mingw32-gcc +BuildRequires: mingw32-runtime -Requires: mingw-filesystem >= 23 -Requires: mingw-binutils -Requires: mingw-gcc -Requires: mingw-runtime +Requires: mingw32-filesystem >= 23 +Requires: mingw32-binutils +Requires: mingw32-gcc +Requires: mingw32-runtime -# Once this is installed, mingw-bootstrap (binary bootstrapper) is no +# Once this is installed, mingw32-bootstrap (binary bootstrapper) is no # longer needed. +Obsoletes: mingw32-w32api-bootstrap Obsoletes: mingw-w32api-bootstrap -#%define _use_internal_dependency_generator 0 -#%define __debug_install_post %{nil} +Provides: mingw-w32api = %{version}-%{release} +Obsoletes: mingw-w32api < 3.11-7 %description @@ -45,7 +46,7 @@ MinGW Windows cross-compiler Win32 header files. %build ./configure \ --build=%_build \ - --host=%{_mingw_host} + --host=%{_mingw32_host} make @@ -53,7 +54,7 @@ make %install rm -rf $RPM_BUILD_ROOT -make prefix=$RPM_BUILD_ROOT%{_mingw_prefix} install +make prefix=$RPM_BUILD_ROOT%{_mingw32_prefix} install %clean @@ -62,11 +63,14 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%{_mingw_includedir}/* -%{_mingw_libdir}/*.a +%{_mingw32_includedir}/* +%{_mingw32_libdir}/*.a %changelog +* Wed Sep 24 2008 Richard W.M. Jones - 3.11-7 +- Rename mingw -> mingw32. + * Wed Sep 10 2008 Richard W.M. Jones - 3.11-6 - Moved ole provides to mingw-filesystem package. -- 1.8.3.1