From dba0857029377174a35f0067b2decc4574aaacc1 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sep 19 2020 15:33:05 +0000 Subject: fix --- diff --git a/cinnamon.spec b/cinnamon.spec index 6360884..e8b2bd1 100644 --- a/cinnamon.spec +++ b/cinnamon.spec @@ -1,6 +1,10 @@ %global __requires_exclude ^lib%{name}.so|^lib%{name}-js.so +%if 0%{?fedora} >= 34 +%global gjs_version 1.66.0 +%else %global cjs_version 4.6.0 +%endif %global cinnamon_desktop_version 4.6.0 %global cinnamon_translations_version 4.6.0 %global gobject_introspection_version 1.38.0 @@ -34,7 +38,7 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: desktop-file-utils %if 0%{?fedora} >= 34 -BuildRequires: pkgconfig(gjs-1.0) >= 1.56.0 +BuildRequires: pkgconfig(gjs-1.0) >= %{gjs_version} %else BuildRequires: pkgconfig(cjs-1.0) >= %{cjs_version} %endif @@ -77,7 +81,11 @@ BuildRequires: pkgconfig(xtst) Requires: %{name}-desktop%{?_isa} >= %{cinnamon_desktop_version} Requires: muffin%{?_isa} >= %{muffin_version} +%if 0%{?fedora} >= 34 +Requires: gjs%{?_isa} >= %{gjs_version} +%else Requires: cjs%{?_isa} >= %{cjs_version} +%endif Requires: gnome-menus%{?_isa} >= 3.0.0-2 # wrapper script used to restart old GNOME session if run --replace