From 1342ebf70a57cdf2c212c393bec9a3d49d565a758d8210aad96c16be272b26e5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 22 Oct 2009 12:23:01 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/windows:mingw:win64/mingw64-runtime?expand=0&rev=8 --- mingw-w64-crt-0.0.20090827.0.tar.bz2 | 3 --- mingw-w64-runtime-1.0b.tar.bz2 | 3 +++ ...pmlintrc => mingw64-runtime-1.0b-rpmlintrc | 0 mingw64-runtime.spec | 23 ++++++++----------- 4 files changed, 13 insertions(+), 16 deletions(-) delete mode 100644 mingw-w64-crt-0.0.20090827.0.tar.bz2 create mode 100644 mingw-w64-runtime-1.0b.tar.bz2 rename mingw64-runtime-0.0.20090827.0-rpmlintrc => mingw64-runtime-1.0b-rpmlintrc (100%) diff --git a/mingw-w64-crt-0.0.20090827.0.tar.bz2 b/mingw-w64-crt-0.0.20090827.0.tar.bz2 deleted file mode 100644 index 657e2b2..0000000 --- a/mingw-w64-crt-0.0.20090827.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f2fa7e3dd925aadc87ac0bc790009169c168fa0d905db038b67f0ef2d70e783 -size 1558523 diff --git a/mingw-w64-runtime-1.0b.tar.bz2 b/mingw-w64-runtime-1.0b.tar.bz2 new file mode 100644 index 0000000..57b7beb --- /dev/null +++ b/mingw-w64-runtime-1.0b.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5369ab362e8d706f1496150ec519f864dcd7095dd4ef6cb751c5e054e272275d +size 1542087 diff --git a/mingw64-runtime-0.0.20090827.0-rpmlintrc b/mingw64-runtime-1.0b-rpmlintrc similarity index 100% rename from mingw64-runtime-0.0.20090827.0-rpmlintrc rename to mingw64-runtime-1.0b-rpmlintrc diff --git a/mingw64-runtime.spec b/mingw64-runtime.spec index 513970e..f83148d 100644 --- a/mingw64-runtime.spec +++ b/mingw64-runtime.spec @@ -6,14 +6,14 @@ %define __os_install_post %{_mingw64_install_post} Name: mingw64-runtime -Version: 0.0.20090827.0 +Version: 1.0b Release: 0 -Summary: MinGW Win64 cross-compiler runtime +Summary: MinGW-W64 runtime for win32 License: Public Domain Group: Development/Libraries URL: http://www.mingw.org/ -Source0: http://dl.sourceforge.net/sourceforge/mingw-w64/mingw-w64-crt-%{version}.tar.bz2 +Source0: http://dl.sourceforge.net/sourceforge/mingw-w64/mingw-w64-runtime-%{version}.tar.bz2 Source100: %{name}-%{version}-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,7 +22,7 @@ BuildArch: noarch BuildRequires: mingw64-filesystem BuildRequires: mingw64-binutils -BuildRequires: mingw64-gcc +BuildRequires: mingw64-gcc-bootstrap >= 4.4.0 BuildRequires: mingw64-headers >= %{version} # Once this is installed, mingw64-bootstrap (binary bootstrapper) is no @@ -35,25 +35,22 @@ MinGW Win64 cross-compiler runtime, base libraries. %prep -%setup -q -c +%setup -q -n mingw-w64-runtime-%{version} %build -cd mingw-w64-crt -./configure --host=%{_mingw64_target} --prefix=%{_prefix} --with-sysroot=%{_mingw64_sysroot} -make +./configure --host=%{_mingw64_target} --prefix=%{_prefix} --with-sysroot=%{_mingw64_sysroot} --disable-lib32 --enable-lib64 +make %install rm -rf $RPM_BUILD_ROOT -pushd mingw-w64-crt make DESTDIR=$RPM_BUILD_ROOT install -popd -# The above installs in /usr/x86_64-pc-mingw32/sys-root/x86_64-pc-mingw32/lib +# The above installs in /usr/x86_64-pc-mingw64/sys-root/x86_64-pc-mingw64/lib # which is the wrong location. Move it to %{_mingw64_libdir}. mkdir -p $RPM_BUILD_ROOT%{_mingw64_libdir} -for i in $RPM_BUILD_ROOT%{_prefix}/%{_mingw64_target}/lib/*; do \ -mv $i $RPM_BUILD_ROOT%{_mingw64_libdir}; done +mv $RPM_BUILD_ROOT%{_prefix}/%{_mingw64_target}/lib/* \ + $RPM_BUILD_ROOT%{_mingw64_libdir} %clean rm -rf $RPM_BUILD_ROOT