diff --git a/qt5-qtimageformats.spec b/qt5-qtimageformats.spec index c3945f7cdb09c30b6bd90adb86ed5722d8e19682..a93cdca8dc2e5611b26df20659bdef7a537fc4a0 100644 --- a/qt5-qtimageformats.spec +++ b/qt5-qtimageformats.spec @@ -1,16 +1,21 @@ %global __provides_exclude_from ^%{_qt5_plugindir}/.*\\.so$ Name: qt5-qtimageformats -Version: 5.11.1 -Release: 7 +Version: 5.15.2 +Release: 1 Summary: Qtimageformats component of qt5 -License: LGPLv2 with exceptions or LGPLv3 with exceptions -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 +License: LGPLv2 with exceptions or GPLv3 with exceptions +Url: http://www.qt.io +%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 - 5.15.2-1 +- update to upstream version 5.15.2 + * Thu Mar 18 2021 maminjie - 5.11.1-7 - Fix syntax error when macro is not defined diff --git a/qt5-qtimageformats.yaml b/qt5-qtimageformats.yaml index d16687a581d014bce3fbc4c435120d87386dbfae..5ebe68cae6d416a9380e942e9e38b2f42c769692 100644 --- a/qt5-qtimageformats.yaml +++ b/qt5-qtimageformats.yaml @@ -1,4 +1,4 @@ version_control: git src_repo: https://code.qt.io/qt/qtimageformats.git -tag_prefix: ^v -seperator: . +tag_prefix: "^v" +separator: "." diff --git a/qtimageformats-everywhere-src-5.11.1.tar.xz b/qtimageformats-everywhere-src-5.11.1.tar.xz deleted file mode 100644 index 91cb5cd33150f844fc789f2a73925c9672b342c6..0000000000000000000000000000000000000000 Binary files a/qtimageformats-everywhere-src-5.11.1.tar.xz and /dev/null differ diff --git a/qtimageformats-everywhere-src-5.15.2.tar.xz b/qtimageformats-everywhere-src-5.15.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..10cc3b4ada553050b3f369d267ef0a5924baa3f7 Binary files /dev/null and b/qtimageformats-everywhere-src-5.15.2.tar.xz differ