@@ -7,12 +7,16 @@

 %global dist_version %{fedora}

 %else

 %global dist_full_name Enterprise Linux

+%if 0%{?rhel} >= 9

+%global dist_version %{rhel}

+%else

 %if 0%{?centos_stream} >= 8

 %global dist_version %{rhel}_Stream

 %else

 %global dist_version %{rhel}

 %endif

 %endif

+%endif

 # Runtime settings

 %global desc %{dist_full_name} %{dist_version} Kolab %{repository_version}

@@ -31,7 +35,7 @@

 Requires:   %{repository_name}(release) = %{repository_version}

 %description

-Apheleia IT repository configuration files, such as YUM repository configuration files

+Apheleia IT repository configuration files, such as DNF repository configuration files

 %package -n %{repository_full_name}-release

 Summary:    Kolab Enterprise release files by Apheleia IT

@@ -53,7 +57,7 @@

 Provides:   %{repository_name}-community-release = %{version}

 %description -n %{repository_full_name}-release

-This package provides the repository configuration for Apheleia IT' Enterprise version of Kolab

+This package provides the repository configuration for Apheleia IT's Enterprise version of Kolab

 %prep

@@ -86,27 +90,35 @@

 %endif

     repository_name="%{repository_full_name}"

+    description="%{desc}"

     if  "$repo" == "testing" ; then

         reposuffix=":/Testing"

         repository_name="%{repository_full_name}-testing"

+        description="%{desc} Testing"

     fi

     if  "$repo" == "testing-candidate" ; then

         reposuffix=":/Testing:/Candidate"

         repository_name="%{repository_full_name}-testing-candidate"

+        description="%{desc} Testing Candidate"

     fi

-%if 0%{?fedora} > 0

-    repository_url="https://mirror.apheleia-it.ch/repos/Kolab:/16$reposuffix/Fedora_%{dist_version}$plesk_suffix"

+%if 0%{?rhel} >= 9

+    repository_url="https://mirror.apheleia-it.ch/repos/Kolab:/16$reposuffix/EL_%{dist_version}$plesk_suffix"

 %else

-    repository_url="https://mirror.apheleia-it.ch/repos/Kolab:/16$reposuffix/CentOS_%{dist_version}$plesk_suffix"

+    %if 0%{?fedora} > 0

+        repository_url="https://mirror.apheleia-it.ch/repos/Kolab:/16$reposuffix/Fedora_%{dist_version}$plesk_suffix"

+    %else

+        repository_url="https://mirror.apheleia-it.ch/repos/Kolab:/16$reposuffix/CentOS_%{dist_version}$plesk_suffix"

+    %endif

 %endif

     repository_url_src="$repository_url/src"

+

     cat %{SOURCE0} | \

         sed \

-                -e 's/@@desc@@/%{desc}/g' \

+                -e "s/@@desc@@/$description/g" \

                 -e "s/@@enabled@@/$enabled/g" \

                 -e "s|@@repository_url@@|$repository_url|g" \

                 -e "s|@@repository_url_src@@|$repository_url_src|g" \

​