summaryrefslogtreecommitdiffstats
path: root/redhat/main/tdebase/tdebase.spec
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2021-05-13 09:46:24 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2021-05-13 22:38:22 +0200
commit1b7896756887e1e758b241ea4df922d6d0a4673d (patch)
tree393180abedd196b112ca3759e391c2542303e67c /redhat/main/tdebase/tdebase.spec
parent9750a57a4120bc49f8788a42fd9f0c63bdba7d8f (diff)
downloadtde-packaging-1b7896756887e1e758b241ea4df922d6d0a4673d.tar.gz
tde-packaging-1b7896756887e1e758b241ea4df922d6d0a4673d.zip
RPM: add build support for Fedora 34
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/main/tdebase/tdebase.spec')
-rw-r--r--redhat/main/tdebase/tdebase.spec12
1 files changed, 10 insertions, 2 deletions
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec
index 1a9c51be0..5be7fb123 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -274,6 +274,14 @@ Requires: fedora-logos
%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
%endif
+# Fedora 34 Theme
+%if 0%{?fedora} == 34
+Requires: f34-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f34/default/standard/f34.png
+Requires: fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
# RHEL 4 Theme
%if 0%{?rhel} == 4
Requires: desktop-backgrounds-basic
@@ -528,7 +536,7 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
@@ -757,7 +765,7 @@ BuildRequires: xorg-x11-proto-devel
BuildRequires: xorg-x11-font-utils
%endif
-%if 0%{?suse_version} >= 1220
+%if 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34
BuildRequires: font-util
BuildRequires: bdftopcf
%endif