diff --git a/libqt5-qttools.changes b/libqt5-qttools.changes index 1fc9a0f..33403b8 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Nov 20 12:09:40 UTC 2020 - Fabian Vogt + +- Update to 5.15.2: + * New bugfix release + * For more details please see: + http://code.qt.io/cgit/qt/qttools.git/plain/dist/changes-5.15.2/?h=5.15.2 + +------------------------------------------------------------------- +Mon Sep 28 08:12:24 UTC 2020 - Christophe Giboudeaux + +- Fix the clang requirement for Leap 15.2. The clang headers are + also in the libclang package. +- Use the %pkg_version macro available since Leap 15 + ------------------------------------------------------------------- Thu Sep 10 07:57:29 UTC 2020 - Fabian Vogt diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index 035c5f5..1f4e08a 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -18,9 +18,9 @@ %define qt5_snapshot 0 %define base_name libqt5 -%define real_version 5.15.1 -%define so_version 5.15.1 -%define tar_version qttools-everywhere-src-5.15.1 +%define real_version 5.15.2 +%define so_version 5.15.2 +%define tar_version qttools-everywhere-src-5.15.2 %if 0%{?suse_version} >= 1330 %bcond_without qdoc %else @@ -28,7 +28,7 @@ %bcond_with qdoc %endif Name: libqt5-qttools -Version: 5.15.1 +Version: 5.15.2 Release: 0 Summary: Qt 5 QtTools Module # Legal: @@ -208,10 +208,12 @@ License: GPL-3.0-only Provides: libqt5-qtbase-doc = %{version} Obsoletes: libqt5-qtbase-doc < %{version} # qdoc hardcodes clang include paths: boo#1109367, QTBUG-70687 -%if 0%{?suse_version} < 1550 -%requires_eq clang%(rpm -q --qf '%''{version}' clang-devel | cut -d. -f1) +%global _clang_major_version %(printf %{pkg_version clang-devel} | cut -d. -f1) + +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200 +%requires_eq libclang%{_clang_major_version} %else -%requires_eq libclang%(rpm -q --qf '%''{version}' clang-devel | cut -d. -f1) +%requires_eq clang%{_clang_major_version} %endif %description doc diff --git a/qttools-everywhere-src-5.15.1.tar.xz b/qttools-everywhere-src-5.15.1.tar.xz deleted file mode 100644 index 5108238..0000000 --- a/qttools-everywhere-src-5.15.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c98ee5f0f980bf68cbf0c94d62434816a92441733de50bd9adbe9b9055f03498 -size 8901096 diff --git a/qttools-everywhere-src-5.15.2.tar.xz b/qttools-everywhere-src-5.15.2.tar.xz new file mode 100644 index 0000000..ff73b8e --- /dev/null +++ b/qttools-everywhere-src-5.15.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc +size 8894728