From 7caa0ff017e3992e58c25ada997614fed4803d6ddb3bb85c5375265c973a2b60 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 9 Feb 2014 13:03:08 +0000 Subject: [PATCH] Accepting request 220722 from home:jengelh:branches:windows:mingw:win64 this should have all been in a single multi-package SR, but alas I seem to have failed OBS-URL: https://build.opensuse.org/request/show/220722 OBS-URL: https://build.opensuse.org/package/show/windows:mingw:win64/mingw64-runtime?expand=0&rev=28 --- mingw-w64-crt-3.1.0.tar.xz | 3 +++ mingw-w64-runtime-20120404.tar.bz2 | 3 --- mingw-w64-runtime-20130216.tar.bz2 | 3 --- mingw64-runtime-rpmlintrc | 2 -- mingw64-runtime.spec | 39 +++++++++++------------------- 5 files changed, 17 insertions(+), 33 deletions(-) create mode 100644 mingw-w64-crt-3.1.0.tar.xz delete mode 100644 mingw-w64-runtime-20120404.tar.bz2 delete mode 100644 mingw-w64-runtime-20130216.tar.bz2 diff --git a/mingw-w64-crt-3.1.0.tar.xz b/mingw-w64-crt-3.1.0.tar.xz new file mode 100644 index 0000000..120be33 --- /dev/null +++ b/mingw-w64-crt-3.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b55b353e397e95acf3325cb9135ba22114bf5ab8321bc97f387ed86d82e4edd9 +size 1177944 diff --git a/mingw-w64-runtime-20120404.tar.bz2 b/mingw-w64-runtime-20120404.tar.bz2 deleted file mode 100644 index c00c0d4..0000000 --- a/mingw-w64-runtime-20120404.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51c053ad99be4eec379e89a8c5b33dfe37fe4415ebcbb87babcefe79dff865b1 -size 2535195 diff --git a/mingw-w64-runtime-20130216.tar.bz2 b/mingw-w64-runtime-20130216.tar.bz2 deleted file mode 100644 index 00e3860..0000000 --- a/mingw-w64-runtime-20130216.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ba62654297acff99acc9e3b3d8fb1eb6d927a058e56b7cb0a5eb18a809c923e -size 1343521 diff --git a/mingw64-runtime-rpmlintrc b/mingw64-runtime-rpmlintrc index 95e22aa..e492e72 100644 --- a/mingw64-runtime-rpmlintrc +++ b/mingw64-runtime-rpmlintrc @@ -1,3 +1 @@ -addFilter("devel-file-in-non-devel-package") -addFilter("spurious-executable-perm") addFilter("arch-independent-package-contains-binary-or-object") diff --git a/mingw64-runtime.spec b/mingw64-runtime.spec index 1d4afe6..7b28467 100644 --- a/mingw64-runtime.spec +++ b/mingw64-runtime.spec @@ -24,24 +24,23 @@ %define __os_install_post %{_mingw64_install_post} Name: mingw64-runtime -Version: 20130216 +Version: 3.1.0 Release: 0 -Summary: MinGW-W64 runtime for win32 +Summary: MinGW-w64 runtime for Win64 License: SUSE-Public-Domain -Group: Development/Libraries +Group: Development/Libraries/C and C++ +URL: http://mingw-w64.sf.net/ -Url: http://mingw-w64.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/mingw-w64/mingw-w64-runtime-%{version}.tar.bz2 -Source100: %{name}-rpmlintrc +Source: mingw-w64-crt-%version.tar.xz +Source100: %name-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build - BuildArch: noarch #!BuildIgnore: post-build-checks - BuildRequires: mingw64-cross-binutils BuildRequires: mingw64-cross-gcc-bootstrap >= 4.4.0 BuildRequires: mingw64-filesystem -BuildRequires: mingw64-headers >= %{version} +BuildRequires: mingw64-headers >= %version +BuildRequires: xz # Once this is installed, mingw64-bootstrap (binary bootstrapper) is no # longer needed. @@ -50,29 +49,19 @@ Obsoletes: mingw64-runtime-bootstrap %description MinGW Win64 cross-compiler runtime, base libraries. - %prep -%setup -q -n mingw-w64-runtime-%{version} +%setup -qn mingw-w64-crt %build -%{_mingw64_configure} --disable-lib32 --enable-lib64 -make +%_mingw64_configure --disable-lib32 --enable-lib64 +make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT - -make DESTDIR=$RPM_BUILD_ROOT install - -rm -f $RPM_BUILD_ROOT%{_prefix}/%{_mingw64_target}/lib -rm -rf $RPM_BUILD_ROOT%{_prefix}/%{_mingw64_target}/libsrc - -rm -rf $RPM_BUILD_ROOT%{_mingw64_includedir}/*.c - -%clean -rm -rf $RPM_BUILD_ROOT +make DESTDIR="%buildroot" install +rm -Rfv "%buildroot/%_mingw64_includedir"/*.c %files %defattr(-,root,root) -%{_mingw64_libdir}/* +%_mingw64_libdir/ %changelog