simplify

SPECS/rocky-release.spec

@@ -11,7 +11,6 @@
 %define minor   3
 %define rocky_rel 5
 %define upstream_rel %{major}.%{minor}
-%define upstream_rel_long %{upstream_rel}-1
 
 %define base_release_version %{major}
 %define full_release_version %{major}
@@ -35,8 +34,8 @@ BuildArch:      noarch
 # What do we provide?
 Provides:       rocky-release = %{version}-%{release}
 Provides:       rocky-release(upstream) = %{upstream_rel}
-Provides:       redhat-release = %{upstream_rel_long}
-Provides:       system-release = %{upstream_rel_long}
+Provides:       redhat-release = %{version}-%{release}
+Provides:       system-release = %{version}-%{release}
 Provides:       system-release(releasever) = %{major}
 
 ## Required by libdnf
@@ -90,7 +89,7 @@ BuildArch:      noarch
 Provides:       rocky-repos(%{major}) = %{upstream_rel}
 Requires:       system-release = %{upstream_rel}
 Requires:       rocky-gpg-keys
-Conflicts:      ${name} < 8.0
+Conflicts:      %{name} < 8.0
 
 %description -n rocky-repos
 %{distro} package repository files for yum/dnf