diff --git a/qt5-qtcharts.spec b/qt5-qtcharts.spec index 00f923b..2d776c4 100644 --- a/qt5-qtcharts.spec +++ b/qt5-qtcharts.spec @@ -3,14 +3,14 @@ Summary: Qt5 - Charts component Name: qt5-%{qt_module} Version: 5.9.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 Url: http://www.qt.io -Source0: https://download.qt.io/official_releases/qt/5.9/5.9.0/submodules/qtcharts-opensource-src-5.9.0.tar.xz +Source0: https://download.qt.io/official_releases/qt/5.9/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz BuildRequires: qt5-qtbase-devel >= %{version} -BuildRequires: pkgconfig(Qt5Qml) >= %{version} +BuildRequires: qt5-qtdeclarative-devel >= %{version} %description Qt Charts module provides a set of easy to use chart components. It uses the Qt Graphics View Framework, therefore charts can be easily @@ -35,15 +35,27 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{qmake_qt5} .. \ +%{qmake_qt5} \ %{?_qt5_examplesdir:CONFIG+=qt_example_installs} make %{?_smp_mflags} + %install -make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} +make install INSTALL_ROOT=%{buildroot} + +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt5_libdir} +for prl_file in libQt5*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -51,23 +63,26 @@ make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} %files %license LICENSE.GPL3 %{_qt5_libdir}/libQt5Charts.so.5* -%{_qt5_qmldir}/QtCharts +%{_qt5_qmldir}/QtCharts/ %files devel %{_qt5_headerdir}/QtCharts/ %{_qt5_libdir}/libQt5Charts.so %{_qt5_libdir}/libQt5Charts.prl -%dir %{_qt5_libdir}/cmake/Qt5Charts/ -%{_qt5_libdir}/cmake/Qt5Charts +%{_qt5_libdir}/cmake/Qt5Charts/ %{_qt5_libdir}/pkgconfig/Qt5Charts.pc %{_qt5_prefix}/mkspecs/modules/* -%exclude %{_qt5_libdir}/libQt5Charts.la %files examples %{_qt5_examplesdir}/ %changelog +* Fri Jun 16 2017 Rex Dieter - 5.9.0-2 +- Source URL +- .prl/.la file love +- drop shadow/out-of-tree builds (#1456211,QTBUG-37417) + * Wed May 31 2017 Helio Chissini de Castro - 5.9.0-1 - Upstream official release