|
@@ -40,7 +40,7 @@
|
|
|
|
|
|
%if %{with systemd}
|
|
|
%global journald -journald
|
|
|
-BuildRequires: pkgconfig(libsystemd)
|
|
|
+BuildRequires: systemd-devel
|
|
|
%endif
|
|
|
|
|
|
%if %{with gcc6}
|
|
@@ -63,14 +63,14 @@ BuildRequires: pkgconfig(libsystemd)
|
|
|
%global tests 1
|
|
|
%endif
|
|
|
|
|
|
-%global qt5_version 5.12.7
|
|
|
+%global qt5_version 5.12.8
|
|
|
%global qt5_minorver %(echo %{version} | sed -e 's/\\.[0-9]*$//')
|
|
|
#global qt5_patchlevel 1
|
|
|
|
|
|
Summary: Qt5 - QtBase components
|
|
|
Name: qt5-qtbase
|
|
|
Version: %{qt5_version}%{?qt5_patchlevel:.%{qt5_patchlevel}}
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
|
|
|
# See LGPL_EXCEPTIONS.txt, for exception details
|
|
|
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
|
@@ -150,9 +150,6 @@ Patch68: qtbase-everywhere-src-5.11.1-python3.patch
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1732129
|
|
|
Patch80: qtbase-use-wayland-on-gnome.patch
|
|
|
|
|
|
-# https://codereview.qt-project.org/c/qt/qtbase/+/293909
|
|
|
-Patch1000: CVE-2015-9541.patch
|
|
|
-
|
|
|
# macros, be mindful to keep sync'd with macros.qt5-base
|
|
|
%define _qt5 %{name}
|
|
|
|
|
@@ -190,7 +187,9 @@ BuildRequires: pkgconfig(libproxy-1.0)
|
|
|
# xcb-sm
|
|
|
BuildRequires: pkgconfig(ice) pkgconfig(sm)
|
|
|
BuildRequires: pkgconfig(libpng)
|
|
|
+%if !%{with systemd}
|
|
|
BuildRequires: pkgconfig(libudev)
|
|
|
+%endif
|
|
|
%global openssl -openssl-linked
|
|
|
BuildRequires: pkgconfig(openssl)
|
|
|
BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib)
|
|
@@ -378,9 +377,6 @@ Qt5 libraries used for drawing widgets and OpenGL items.
|
|
|
#patch80 -p1 -b .use-wayland-on-gnome.patch
|
|
|
#endif
|
|
|
|
|
|
-%patch1000 -p1 -b .CVE-2015-9541
|
|
|
-
|
|
|
-
|
|
|
%define platform linux-g++
|
|
|
|
|
|
# move some bundled libs to ensure they're not accidentally used
|
|
@@ -1040,6 +1036,10 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Apr 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.8-1
|
|
|
+- new upstream release.
|
|
|
+- dropped Patch1000: fixed in upstream.
|
|
|
+
|
|
|
* Mon Mar 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.7-1
|
|
|
- new upstream release.
|
|
|
- imported Patch1000 from upstream to fix CVE-2015-9541.
|