From 52a4e161c6e0104c8637773817c18e305714d3e26f2d1f0560e46ce6189cedbc Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 21 Apr 2015 23:10:45 +0000 Subject: [PATCH] Accepting request 296826 from KDE:Qt5 Adjust usage of latest %qmake5_install macro OBS-URL: https://build.opensuse.org/request/show/296826 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdeclarative?expand=0&rev=23 --- libqt5-qtdeclarative.changes | 5 +++++ libqt5-qtdeclarative.spec | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index c29e7a4..722e716 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 9 17:30:27 UTC 2015 - hrvoje.senjan@gmail.com + +- Adjust usage of latest %qmake5_install macro + ------------------------------------------------------------------- Tue Feb 24 16:10:14 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index 74b602e..785c003 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -158,12 +158,16 @@ popd %endif %install -%qmake5_install -C %{_target_platform} +pushd %{_target_platform} +%qmake5_install +popd %ifarch %ix86 mkdir -p %{buildroot}%{_libqt5_libdir}//sse2 mv %{buildroot}%{_libqt5_libdir}/libQt5Qml.so.5* %{buildroot}%{_libqt5_libdir}/sse2/ -%qmake5_install -C %{_target_platform}-no_sse2/src/qml +pushd %{_target_platform}-no_sse2/src/qml +%qmake5_install +popd %endif find %{buildroot}/%{_libdir} -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;