Replace %include of defs with explicit macros to avoid chicken+egg problem in mock...

diff --git a/atk/mingw-atk.spec b/atk/mingw-atk.spec
index 0a1b18c..11d0e16 100644 (file)
--- a/atk/mingw-atk.spec
+++ b/atk/mingw-atk.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-atk
 Version:        1.23.5
@@ -14,7 +18,7 @@ Patch1: atk-%{version}-mingw.patch
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-iconv

diff --git a/cairo/mingw-cairo.spec b/cairo/mingw-cairo.spec
index 813317c..9f885e2 100644 (file)
--- a/cairo/mingw-cairo.spec
+++ b/cairo/mingw-cairo.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-cairo
 Version:        1.7.4
@@ -13,7 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-libxml2

diff --git a/example/mingw-example.spec b/example/mingw-example.spec
index 7492ba3..3a1c5d5 100644 (file)
--- a/example/mingw-example.spec
+++ b/example/mingw-example.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-example
 Version:        1.2.3
@@ -13,7 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 21
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 # Any additional BuildRequires.

diff --git a/fontconfig/mingw-fontconfig.spec b/fontconfig/mingw-fontconfig.spec
index 2a523e3..02fccb9 100644 (file)
--- a/fontconfig/mingw-fontconfig.spec
+++ b/fontconfig/mingw-fontconfig.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-fontconfig
 Version:        2.6.0
@@ -13,7 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-freetype

diff --git a/freetype/mingw-freetype.spec b/freetype/mingw-freetype.spec
index d51c5d3..14efc25 100644 (file)
--- a/freetype/mingw-freetype.spec
+++ b/freetype/mingw-freetype.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-freetype
 Version:        2.3.7
@@ -13,7 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-zlib

diff --git a/gettext/mingw-gettext.spec b/gettext/mingw-gettext.spec
index 35a1368..4ad4b95 100644 (file)
--- a/gettext/mingw-gettext.spec
+++ b/gettext/mingw-gettext.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-gettext
 Version:   0.17
@@ -13,6 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
+BuildRequires: mingw-filesystem >= 23
 BuildRequires: mingw-gcc
 BuildRequires: mingw-gcc-c++
 BuildRequires: mingw-binutils

diff --git a/glib2/mingw-glib2.spec b/glib2/mingw-glib2.spec
index fe3e83f..9e62088 100644 (file)
--- a/glib2/mingw-glib2.spec
+++ b/glib2/mingw-glib2.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-glib2
 Version:        2.18.0
@@ -15,7 +19,7 @@ BuildArch:      noarch
 
 Patch2:         gio-2.16-only-pass-uri-to-gio-apps.patch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-iconv

diff --git a/gnutls/mingw-gnutls.spec b/gnutls/mingw-gnutls.spec
index 7f29228..b478cdb 100644 (file)
--- a/gnutls/mingw-gnutls.spec
+++ b/gnutls/mingw-gnutls.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-gnutls
 Version:        2.4.1
@@ -15,7 +19,7 @@ BuildArch:      noarch
 
 Patch0:         gnutls-certtool-build.patch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-libgpg-error

diff --git a/gtk2/mingw-gtk2.spec b/gtk2/mingw-gtk2.spec
index 6145e5d..0a90999 100644 (file)
--- a/gtk2/mingw-gtk2.spec
+++ b/gtk2/mingw-gtk2.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-gtk2
 Version:        2.14.0
@@ -13,7 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-iconv

diff --git a/iconv/mingw-iconv.spec b/iconv/mingw-iconv.spec
index c173597..fea6c24 100644 (file)
--- a/iconv/mingw-iconv.spec
+++ b/iconv/mingw-iconv.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-iconv
 Version:   1.12
@@ -12,7 +16,7 @@ Source0:   http://ftp.gnu.org/pub/gnu/libiconv/libiconv-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-BuildRequires: mingw-filesystem >= 19
+BuildRequires: mingw-filesystem >= 23
 BuildRequires: mingw-gcc
 BuildRequires: mingw-binutils
 

diff --git a/jasper/mingw-jasper.spec b/jasper/mingw-jasper.spec
index 26e6d41..30e67b3 100644 (file)
--- a/jasper/mingw-jasper.spec
+++ b/jasper/mingw-jasper.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-jasper
 Version:        1.900.1
@@ -16,7 +20,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-libjpeg

diff --git a/libgcrypt/mingw-libgcrypt.spec b/libgcrypt/mingw-libgcrypt.spec
index 483e6c8..924dd9b 100644 (file)
--- a/libgcrypt/mingw-libgcrypt.spec
+++ b/libgcrypt/mingw-libgcrypt.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-libgcrypt
 Version:        1.4.1
@@ -13,7 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-libgpg-error

diff --git a/libgpg-error/mingw-libgpg-error.spec b/libgpg-error/mingw-libgpg-error.spec
index 3110408..f10adcd 100644 (file)
--- a/libgpg-error/mingw-libgpg-error.spec
+++ b/libgpg-error/mingw-libgpg-error.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-libgpg-error
 Version:        1.6
@@ -12,7 +16,7 @@ Source0:        ftp://ftp.gnupg.org/GnuPG/libgpg-error/libgpg-error-%{version}.t
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 17
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-gettext

diff --git a/libjpeg/mingw-libjpeg.spec b/libjpeg/mingw-libjpeg.spec
index fc50282..72ba205 100644 (file)
--- a/libjpeg/mingw-libjpeg.spec
+++ b/libjpeg/mingw-libjpeg.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-libjpeg
 Version:        6b
@@ -9,7 +13,7 @@ License:        IJG
 URL:            http://www.ijg.org/
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:        ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.gz
+Source0:        ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.bz2
 Source1:        libjpeg-configure.in
 
 Patch1:         jpeg-c++.patch
@@ -21,7 +25,7 @@ Patch100:       jpeg-mingw.patch
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-libpng

diff --git a/libpng/mingw-libpng.spec b/libpng/mingw-libpng.spec
index 64b13a5..6769998 100644 (file)
--- a/libpng/mingw-libpng.spec
+++ b/libpng/mingw-libpng.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-libpng
 Version:        1.2.31
@@ -13,10 +17,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
-
+BuildRequires:  mingw-zlib
 
 %description
 MinGW Windows Libpng library.

diff --git a/libvirt/mingw-libvirt.spec b/libvirt/mingw-libvirt.spec
index c0d66ea..34de139 100644 (file)
--- a/libvirt/mingw-libvirt.spec
+++ b/libvirt/mingw-libvirt.spec
@@ -1,4 +1,8 @@
-%include        /usr/lib/rpm/mingw-defs
+%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-libvirt
 Version:        0.4.5
@@ -11,7 +15,7 @@ URL:            http://www.libvirt.org/
 Source0:        ftp://libvirt.org/libvirt/libvirt-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-libgpg-error

diff --git a/libxml2/mingw-libxml2.spec b/libxml2/mingw-libxml2.spec
index 0aba19a..0138197 100644 (file)
--- a/libxml2/mingw-libxml2.spec
+++ b/libxml2/mingw-libxml2.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-libxml2
 Version:        2.6.32
@@ -13,7 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-zlib

diff --git a/pango/mingw-pango.spec b/pango/mingw-pango.spec
index 8aeab6a..d761ed6 100644 (file)
--- a/pango/mingw-pango.spec
+++ b/pango/mingw-pango.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-pango
 Version:        1.21.6
@@ -13,7 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-iconv

diff --git a/pixman/mingw-pixman.spec b/pixman/mingw-pixman.spec
index 334ada2..77c46d2 100644 (file)
--- a/pixman/mingw-pixman.spec
+++ b/pixman/mingw-pixman.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-pixman
 Version:        0.11.10
@@ -13,7 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 

diff --git a/portablexdr/mingw-portablexdr.spec b/portablexdr/mingw-portablexdr.spec
index ce52d91..4069ace 100644 (file)
--- a/portablexdr/mingw-portablexdr.spec
+++ b/portablexdr/mingw-portablexdr.spec
@@ -1,4 +1,8 @@
-%include /usr/lib/rpm/mingw-defs
+%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-portablexdr
 Version:        4.0.10
@@ -13,7 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 

diff --git a/bootstrap/mingw-bootstrap.spec b/runtime-bootstrap/mingw-runtime-bootstrap.spec
similarity index 84%
rename from bootstrap/mingw-bootstrap.spec
rename to runtime-bootstrap/mingw-runtime-bootstrap.spec
index 3af55fb..0adcd5c 100644 (file)
--- a/bootstrap/mingw-bootstrap.spec
+++ b/runtime-bootstrap/mingw-runtime-bootstrap.spec
@@ -4,9 +4,8 @@
 %define __os_install_post /usr/lib/rpm/brp-compress %{nil}
 
 %define runtime_version 3.14
-%define w32api_version 3.11
 
-Name:           mingw-bootstrap
+Name:           mingw-runtime-bootstrap
 Version:        1
 Release:        3%{?dist}
 Summary:        MinGW Windows bootstrap (binary package)
@@ -16,12 +15,10 @@ License:        Public Domain
 URL:            http://www.mingw.org/
 
 Source0:        http://dl.sourceforge.net/sourceforge/mingw/mingw-runtime-%{runtime_version}.tar.gz
-Source1:        http://dl.sourceforge.net/sourceforge/mingw/w32api-%{w32api_version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides:       mingw-runtime = %{runtime_version}
-Provides:       mingw-w32api = %{w32api_version}
 
 
 %description
@@ -30,8 +27,6 @@ MinGW bootstrap (binary package).
 
 %prep
 %setup -q -c
-%setup -q -D -T -a1
-
 
 %build
 rm -rf i686-pc-mingw32

diff --git a/runtime/mingw-runtime.spec b/runtime/mingw-runtime.spec
index 1078fe9..4cddf3b 100644 (file)
--- a/runtime/mingw-runtime.spec
+++ b/runtime/mingw-runtime.spec
@@ -1,4 +1,9 @@
-%include /usr/lib/rpm/mingw-defs
+
+%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
@@ -13,17 +18,17 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:     noarch
 
-BuildRequires:  mingw-filesystem >= 9
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-gcc
 
-Requires:       mingw-filesystem >= 9
+Requires:       mingw-filesystem >= 23
 Requires:       mingw-binutils
 Requires:       mingw-gcc
 
 # Once this is installed, mingw-bootstrap (binary bootstrapper) is no
 # longer needed.
-Obsoletes:      mingw-bootstrap
+Obsoletes:      mingw-runtime-bootstrap
 
 
 %description

diff --git a/w32api-bootstrap/mingw-w32api-bootstrap.spec b/w32api-bootstrap/mingw-w32api-bootstrap.spec
new file mode 100644 (file)
index 0000000..aa2a8ec
--- /dev/null
+++ b/w32api-bootstrap/mingw-w32api-bootstrap.spec
@@ -0,0 +1,58 @@
+# NOTE: NOT a Fedora package.  This contains binaries which are needed
+# just to bootstrap the whole system if you build everything from scratch.
+
+%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
+
+%define w32api_version 3.11
+
+Name:           mingw-w32api-bootstrap
+Version:        1
+Release:        3%{?dist}
+Summary:        MinGW Windows bootstrap (binary package)
+
+Group:          Development/Libraries
+License:        Public Domain
+URL:            http://www.mingw.org/
+
+Source0:        http://dl.sourceforge.net/sourceforge/mingw/w32api-%{w32api_version}.tar.gz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Provides:       mingw-w32api = %{w32api_version}
+
+
+%description
+MinGW bootstrap (binary package).
+
+
+%prep
+%setup -q -c
+
+%build
+rm -rf i686-pc-mingw32
+
+# Setup sys-root.
+mkdir -p i686-pc-mingw32/sys-root/mingw
+cp -a include lib i686-pc-mingw32/sys-root/mingw
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+mkdir -p $RPM_BUILD_ROOT%{_prefix}
+cp -a i686-pc-mingw32 $RPM_BUILD_ROOT%{_prefix}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root)
+%dir %{_prefix}/i686-pc-mingw32
+%{_prefix}/i686-pc-mingw32/sys-root
+
+
+%changelog
+* Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 1-3
+- Initial RPM release.

diff --git a/w32api/mingw-w32api.spec b/w32api/mingw-w32api.spec
index 81ec52b..3cadcf6 100644 (file)
--- a/w32api/mingw-w32api.spec
+++ b/w32api/mingw-w32api.spec
@@ -1,4 +1,9 @@
-%include /usr/lib/rpm/mingw-defs
+
+%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-w32api
 Version:       3.11
@@ -13,19 +18,19 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:     noarch
 
-BuildRequires:  mingw-filesystem >= 3
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-runtime
 
-Requires:       mingw-filesystem >= 3
+Requires:       mingw-filesystem >= 23
 Requires:       mingw-binutils
 Requires:       mingw-gcc
 Requires:       mingw-runtime
 
 # Once this is installed, mingw-bootstrap (binary bootstrapper) is no
 # longer needed.
-Obsoletes:      mingw-bootstrap
+Obsoletes:      mingw-w32api-bootstrap
 
 #%define _use_internal_dependency_generator 0
 #%define __debug_install_post %{nil}

diff --git a/zlib/mingw-zlib.spec b/zlib/mingw-zlib.spec
index 7ab1a94..88d57c7 100644 (file)
--- a/zlib/mingw-zlib.spec
+++ b/zlib/mingw-zlib.spec
@@ -1,4 +1,9 @@
-%include /usr/lib/rpm/mingw-defs
+
+%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-zlib
 Version:        1.2.3
@@ -13,7 +18,7 @@ Patch1:         zlib-win32.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 12
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils