From 202e3a11e49488e6772f647f96cb2504fff091df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 23 Jan 2022 19:18:59 +0100 Subject: RPM: update tdelibs & tdetoys --- redhat/docker/oss153/packages | 1 - redhat/main/tdelibs/tdelibs.spec | 4 ++-- redhat/main/tdetoys/tdetoys.spec | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'redhat') diff --git a/redhat/docker/oss153/packages b/redhat/docker/oss153/packages index 800b1e17b..78c263029 100644 --- a/redhat/docker/oss153/packages +++ b/redhat/docker/oss153/packages @@ -165,7 +165,6 @@ perl-pcsc pkcs11-helper-devel pkgconfig(pygtk-2.0) postgresql10 -postgresql10-devel python-devel python3-devel python3-sip-devel diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec index 8fbdda7cb..3a44d164b 100644 --- a/redhat/main/tdelibs/tdelibs.spec +++ b/redhat/main/tdelibs/tdelibs.spec @@ -277,7 +277,7 @@ Requires: ca-certificates %endif %endif %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8 Requires: rootcerts %define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt %else @@ -379,7 +379,7 @@ Requires: udisks %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 BuildRequires: libudisks2-devel %else -%if 0%{?suse_version} >= 1550 +6+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300 BuildRequires: libudisks2-0-devel %else BuildRequires: udisks2-devel diff --git a/redhat/main/tdetoys/tdetoys.spec b/redhat/main/tdetoys/tdetoys.spec index 3acdebe5e..fc8f62256 100644 --- a/redhat/main/tdetoys/tdetoys.spec +++ b/redhat/main/tdetoys/tdetoys.spec @@ -62,6 +62,7 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-kdesktop >= %{tde_version} BuildRequires: trinity-kicker >= %{tde_version} +BuildRequires: trinity-konqueror >= %{tde_version} BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ -- cgit v1.2.3