diff --git a/.gitignore b/.gitignore index a0e5296..086e595 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtserialport-opensource-src-5.6.2.tar.xz +SOURCES/qtserialport-opensource-src-5.9.2.tar.xz diff --git a/.qt5-qtserialport.metadata b/.qt5-qtserialport.metadata index 6085670..1adc5b0 100644 --- a/.qt5-qtserialport.metadata +++ b/.qt5-qtserialport.metadata @@ -1 +1 @@ -fb1e69f27a84d1dde2a893ab1fed7b187268f908 SOURCES/qtserialport-opensource-src-5.6.2.tar.xz +ab6d095db31a2b18e1400414087484e00cd3ef72 SOURCES/qtserialport-opensource-src-5.9.2.tar.xz diff --git a/SPECS/qt5-qtserialport.spec b/SPECS/qt5-qtserialport.spec index aa8dfb7..ad7f154 100644 --- a/SPECS/qt5-qtserialport.spec +++ b/SPECS/qt5-qtserialport.spec @@ -5,18 +5,19 @@ Summary: Qt5 - SerialPort component Name: qt5-%{qt_module} -Version: 5.6.2 +Version: 5.9.2 Release: 1%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://www.qt.io -Source0: http://download.qt.io/official_releases/qt/5.6/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +Source0: http://download.qt.io/official_releases/qt/5.9/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz BuildRequires: cmake BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: pkgconfig(libudev) +BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} %description @@ -50,13 +51,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep -%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} +%setup -q -n %{qt_module}-opensource-src-%{version} %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{qmake_qt5} .. \ +%{qmake_qt5} \ %{?_qt5_examplesdir:CONFIG+=qt_example_installs} make %{?_smp_mflags} @@ -67,20 +66,13 @@ make %{?_smp_mflags} QT_HASH_SEED=0; export QT_HASH_SEED make %{?_smp_mflags} docs %endif -popd %install -make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} +make install INSTALL_ROOT=%{buildroot} %if 0%{?docs} -make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} - -# workaround issue where on some archs/releases doc file is named examples-serialport.html or qtserialport-examples.html -if [ -f %{buildroot}%{_qt5_docdir}/qtserialport/qtserialport-examples.html ]; then - mv %{buildroot}%{_qt5_docdir}/qtserialport/qtserialport-examples.html \ - %{buildroot}%{_qt5_docdir}/qtserialport/examples-serialport.html -fi +make install_docs INSTALL_ROOT=%{buildroot} %endif ## .prl/.la file love @@ -100,7 +92,7 @@ popd %postun -p /sbin/ldconfig %files -%license LGPL_EXCEPTION.txt LICENSE.GPL* LICENSE.LGPL* +%license LICENSE.* %{_qt5_libdir}/libQt5SerialPort.so.5* %files devel @@ -127,6 +119,14 @@ popd %changelog +* Fri Oct 06 2017 Jan Grulich - 5.9.1-2 +- Update to 5.9.2 + Resolves: bz#1482788 + +* Mon Aug 28 2017 Jan Grulich - 5.9.1-1 +- Update to 5.9.1 + Resolves: bz#1482788 + * Wed Jan 11 2017 Jan Grulich - 5.6.2-1 - Update to 5.6.2 Resolves: bz#1384827