!13 update to upstream version 5.15.2

Merge pull request !13 from pei-jiankang/master

qt5-qtimageformats.spec

@@ -1,16 +1,21 @@
 %global __provides_exclude_from ^%{_qt5_plugindir}/.*\\.so$
 
 Name:           qt5-qtimageformats
-Version:        5.11.1
+Version:        5.15.2
-Release:        7
+Release:        1
 Summary:        Qtimageformats component of qt5
-License:        LGPLv2 with exceptions or LGPLv3 with exceptions
+License:        LGPLv2 with exceptions or GPLv3 with exceptions
-URL:            http://www.qt.io
+Url:            http://www.qt.io
-Source0:        https://download.qt.io/new_archive/qt/5.11/5.11.1/submodules/qtimageformats-everywhere-src-5.11.1.tar.xz
+%global majmin %(echo %{version} | cut -d. -f1-2)
+Source0:        https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/qtimageformats-everywhere-src-%{version}.tar.xz
 
+BuildRequires:  make
 BuildRequires:  qt5-qtbase-devel >= %{version} libmng-devel libtiff-devel libwebp-devel
 %{?_qt5:Requires: %{_qt5} = %{_qt5_version}}
+BuildRequires:  qt5-qtbase-private-devel
+#BuildRequires:  jasper-devel
 
+Obsoletes:      qt5-qtimageformats-devel < 5.4.0
 Provides:       qt5-qtimageformats-devel = %{version}-%{release}
 
 %description
@@ -19,7 +24,8 @@ PNG, JPEG, BMP, GIF and a few more, ref. Reading and Writing Image Files. The Qt
 provides optional support for other image file formats.
 
 %prep
-%autosetup -n qtimageformats-everywhere-src-%{version}
+%autosetup -n qtimageformats-everywhere-src-%{version} -p1
+rm -rv src/3rdparty
 
 %build
 %{qmake_qt5}
@@ -29,11 +35,14 @@ provides optional support for other image file formats.
 make install INSTALL_ROOT=%{buildroot}
 
 %files
-%license LICENSE.* LGPL_EXCEPTION.txt
+%license LICENSE.GPL* LICENSE.LGPL*
 %{_qt5_plugindir}/*/*.so
 %{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_*Plugin.cmake
 
 %changelog
+* Wed Oct 13 2021 peijiankang <peijiankang@kylinos.cn> - 5.15.2-1
+- update to upstream version 5.15.2
+
 * Thu Mar 18 2021 maminjie <maminjie1@huawei.com> - 5.11.1-7
 - Fix syntax error when macro is not defined
 

qt5-qtimageformats.yaml

@@ -1,4 +1,4 @@
 version_control: git
 src_repo: https://code.qt.io/qt/qtimageformats.git
-tag_prefix: ^v
+tag_prefix: "^v"
-seperator: .
+separator: "."