RPM: enable xscreensaver support on rhel9

Signed-off-by: François Andriot <albator78@libertysurf.fr>

7 files changed, 11 insertions, 4 deletions

diff --git a/redhat/applications/internet/konversation/konversation.spec b/redhat/applications/internet/konversation/konversation.spec
index ff64f4fd6..f368e749f 100644
--- a/redhat/applications/internet/konversation/konversation.spec
+++ b/redhat/applications/internet/konversation/konversation.spec
@@ -117,7 +117,8 @@ BuildRequires:	libXi6-devel
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
 #  RHEL 8: available in EPEL
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version}
+#  RHEL 9: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec
index b047f3226..946a06d97 100644
--- a/redhat/applications/settings/tde-guidance/tde-guidance.spec
+++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec
@@ -105,6 +105,7 @@ BuildRequires:	libXxf86vm-devel
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
 #  RHEL 8: available in EPEL
+#  RHEL 9: available in EPEL
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
diff --git a/redhat/applications/system/tdepowersave/tdepowersave.spec b/redhat/applications/system/tdepowersave/tdepowersave.spec
index dd916674a..a57c0e328 100644
--- a/redhat/applications/system/tdepowersave/tdepowersave.spec
+++ b/redhat/applications/system/tdepowersave/tdepowersave.spec
@@ -88,6 +88,7 @@ BuildRequires:	libudev-devel
 # XSCREENSAVER support
 #  Disabled on RHEL4
 #  RHEL 8: available in EPEL
+#  RHEL 9: available in EPEL
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 %if 0%{?rhel} == 5
diff --git a/redhat/core/tdeartwork/tdeartwork.spec b/redhat/core/tdeartwork/tdeartwork.spec
index 5da3eb743..cbe2b851a 100644
--- a/redhat/core/tdeartwork/tdeartwork.spec
+++ b/redhat/core/tdeartwork/tdeartwork.spec
@@ -105,7 +105,8 @@ BuildRequires:	libart_lgpl-devel
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
 #  RHEL 8: available in EPEL
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version}
+#  RHEL 9: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec
index bc1c47cf8..9648593b8 100644
--- a/redhat/core/tdebase/tdebase.spec
+++ b/redhat/core/tdebase/tdebase.spec
@@ -346,7 +346,8 @@ BuildRequires:	OpenEXR-devel
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
 #  RHEL 8: available in EPEL
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version}
+#  RHEL 9: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
diff --git a/redhat/core/tdepim/tdepim.spec b/redhat/core/tdepim/tdepim.spec
index 8332ed77a..e3a9f483e 100644
--- a/redhat/core/tdepim/tdepim.spec
+++ b/redhat/core/tdepim/tdepim.spec
@@ -149,7 +149,8 @@ BuildRequires:	libXcomposite-devel
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
 #  RHEL 8: available in EPEL
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version}
+#  RHEL 9: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
diff --git a/redhat/core/tdeutils/tdeutils.spec b/redhat/core/tdeutils/tdeutils.spec
index 4eda4375c..eb42326d0 100644
--- a/redhat/core/tdeutils/tdeutils.spec
+++ b/redhat/core/tdeutils/tdeutils.spec
@@ -143,6 +143,7 @@ BuildRequires:	libacl-devel
 
 # XSCREENSAVER support
 #  RHEL 8: available in EPEL
+#  RHEL 9: available in EPEL
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 %if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}