From 81c8d808ca2b99d70a5b9edcabbff8c8e1b56cc964a2f0dd5665c537b74bc537 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 24 Aug 2017 15:41:12 +0000 Subject: [PATCH] Accepting request 515804 from KDE:Qt5 - Don't special case sse2 libs on i586 for SLE-15, it supports only SSE2 capable CPUs. (forwarded request 515779 from oertel) OBS-URL: https://build.opensuse.org/request/show/515804 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdeclarative?expand=0&rev=42 --- libqt5-qtdeclarative.changes | 6 ++++++ libqt5-qtdeclarative.spec | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index 12f9d6d..09c449d 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 9 20:26:28 CEST 2017 - ro@suse.de + +- Don't special case sse2 libs on i586 for SLE-15, it supports + only SSE2 capable CPUs. + ------------------------------------------------------------------- Mon Jul 24 19:17:08 UTC 2017 - fabian@ritter-vogt.de diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index 943f7de..9b7279f 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -159,6 +159,7 @@ popd %make_jobs -C %{_target_platform} %ifarch %ix86 +%if 0%{?sle_version:%sle_version} < 150000 # build libQt5Qml with no_sse2 mkdir -p %{_target_platform}-no_sse2 pushd %{_target_platform}-no_sse2 @@ -167,6 +168,7 @@ make sub-src-clean %make_jobs -C src/qml popd %endif +%endif %install pushd %{_target_platform} @@ -174,12 +176,14 @@ pushd %{_target_platform} popd %ifarch %ix86 +%if 0%{?sle_version:%sle_version} < 150000 mkdir -p %{buildroot}%{_libqt5_libdir}//sse2 mv %{buildroot}%{_libqt5_libdir}/libQt5Qml.so.5* %{buildroot}%{_libqt5_libdir}/sse2/ pushd %{_target_platform}-no_sse2/src/qml %qmake5_install popd %endif +%endif find %{buildroot}/%{_libdir} -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \; find %{buildroot}/%{_libdir}/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \; @@ -212,8 +216,10 @@ popd %doc LICENSE.* %{_libqt5_libdir}/libQt5Q*.so.* %ifarch %ix86 +%if 0%{?sle_version:%sle_version} < 150000 %{_libqt5_libdir}/sse2/libQt5Q*.so.* %endif +%endif %dir %{_libqt5_archdatadir}/qml %dir %{_libqt5_archdatadir}/qml/Qt %{_libqt5_archdatadir}/qml/QtQuick