diff --git a/.gitignore b/.gitignore index e4e84c6..16236eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtscript-opensource-src-5.6.2.tar.xz +SOURCES/qtscript-opensource-src-5.9.2.tar.xz diff --git a/.qt5-qtscript.metadata b/.qt5-qtscript.metadata index 935cd1b..96e7db2 100644 --- a/.qt5-qtscript.metadata +++ b/.qt5-qtscript.metadata @@ -1 +1 @@ -672bd8ea2f63fd63c42f9711fad9a57fc5fd6e4d SOURCES/qtscript-opensource-src-5.6.2.tar.xz +ac6ad8dc3727194b7d339e9f3283692026e79066 SOURCES/qtscript-opensource-src-5.9.2.tar.xz diff --git a/SPECS/qt5-qtscript.spec b/SPECS/qt5-qtscript.spec index 94dce9d..081ef08 100644 --- a/SPECS/qt5-qtscript.spec +++ b/SPECS/qt5-qtscript.spec @@ -5,22 +5,21 @@ Summary: Qt5 - QtScript 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 # add s390(x0 support to Platform.h (taken from webkit) Patch0: qtscript-opensource-src-5.5.0-s390.patch -BuildRequires: cmake BuildRequires: qt5-qtbase-devel >= %{version} -BuildRequires: qt5-qtbase-private-devel BuildRequires: pkgconfig(Qt5UiTools) +BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} %description @@ -59,23 +58,20 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{qmake_qt5} .. +%{qmake_qt5} make %{?_smp_mflags} %if 0%{?docs} 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} +make install_docs INSTALL_ROOT=%{buildroot} %endif ## .prl file love (maybe consider just deleting these -- rex @@ -126,6 +122,14 @@ rm -fv %{buildroot}%{_qt5_libdir}/lib*.la %changelog +* Fri Oct 06 2017 Jan Grulich - 5.9.2-1 +- Update to 5.9.2 + Resolves: bz#1482786 + +* Mon Aug 28 2017 Jan Grulich - 5.9.1-1 +- Update to 5.9.1 + Resolves: bz#1482786 + * Wed Jan 11 2017 Jan Grulich - 5.6.2-1 - Update to 5.6.2 Resolves: bz#1384825