diff --git a/lightdm.spec b/lightdm.spec index cfb7c43..8826030 100644 --- a/lightdm.spec +++ b/lightdm.spec @@ -1,7 +1,7 @@ # FIXME: most tests currently fail %bcond_with tests -%if 0%{?fedora} || 0%{?rhel} < 8 +%if (0%{?fedora} && 0%{?fedora} < 34) || (0%{?rhel} && 0%{?rhel} < 8) %global _with_qt4 1 %endif @@ -11,7 +11,7 @@ Name: lightdm Summary: A cross-desktop Display Manager Version: 1.30.0 -Release: 12%{?dist} +Release: 13%{?dist} %if 0%{?rhel} >= 8 # Exclude failing arch @@ -65,7 +65,6 @@ BuildRequires: pkgconfig(gmodule-export-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.5 BuildRequires: pkgconfig(libxklavier) -%{?_with_qt4:BuildRequires: pkgconfig(QtCore) pkgconfig(QtDBus) pkgconfig(QtGui) pkgconfig(QtNetwork)} BuildRequires: pkgconfig(Qt5Core) pkgconfig(Qt5DBus) pkgconfig(Qt5Gui) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) @@ -84,6 +83,11 @@ Requires: xorg-x11-xinit Requires: (lightdm-greeter = 1.2 if xorg-x11-server-Xorg) +%if ! 0%{?_with_qt4} +Obsoletes: lightdm-qt < 1.30.0-13 +Obsoletes: lightdm-qt-devel < 1.30.0-13 +%endif + %{?systemd_requires} Requires(pre): shadow-utils @@ -117,8 +121,8 @@ Requires: %{name}-gobject%{?_isa} = %{version}-%{release} %if 0%{?_with_qt4} %package qt Summary: LightDM Qt4 client library +BuildRequires: pkgconfig(QtCore) pkgconfig(QtDBus) pkgconfig(QtGui) pkgconfig(QtNetwork) Requires: %{name}%{?_isa} = %{version}-%{release} -%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} %description qt This package contains a Qt4-based library for LightDM clients to use to interface with LightDM. @@ -320,6 +324,9 @@ fi %changelog +* Tue Dec 22 2020 Rex Dieter - 1.30.0-13 +- disable qt4 support on f34+ + * Tue Dec 22 2020 Rex Dieter - 1.30.0-12 - adjust dbus runtime dep: -dbus-x11 +dbus (since fedora switched to dbus-broker)