diff --git a/gerbera.changes b/gerbera.changes
index dafa71b..9cafb87 100644
--- a/gerbera.changes
+++ b/gerbera.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct  6 07:21:59 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
+
+- Use better macro for selecting a newer GCC on Leap.
+
 -------------------------------------------------------------------
 Thu Jun 15 11:44:52 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/gerbera.spec b/gerbera.spec
index 9eec93f..1fd9505 100644
--- a/gerbera.spec
+++ b/gerbera.spec
@@ -16,6 +16,10 @@
 #
 
 
+%if 0%{?suse_version} && 0%{?suse_version} < 1590
+%global force_gcc_version 12
+%endif
+
 Name:           gerbera
 Version:        1.12.1
 Release:        0
@@ -57,11 +61,7 @@ BuildRequires:  pkgconfig(uuid)
 BuildRequires:  pkgconfig(zlib)
 Requires:       logrotate
 %{?systemd_requires}
-%if 0%{?suse_version} <= 1550
-BuildRequires:  gcc10-c++
-%else
-BuildRequires:  gcc-c++
-%endif
+BuildRequires:  gcc%{?force_gcc_version}-c++ >= 12
 
 %description
 Gerbera is a UPnP media server which allows streaming digital
@@ -84,9 +84,8 @@ sed -i -e 's/@GROUP@/gerbera/' %{SOURCE2}
   -DWITH_AVCODEC=1 \
   -DWITH_EXIF=0 \
   -DWITH_EXIV2=1 \
-%if 0%{?suse_version} <= 1550
-  -DCMAKE_CXX_COMPILER=g++-10 \
-  -DCMAKE_C_COMPILER=gcc-10 \
+%if 0%{?force_gcc_version}
+    -DCMAKE_CXX_COMPILER=%{_bindir}/g++-%{?force_gcc_version} \
 %endif
   -DWITH_FFMPEGTHUMBNAILER=1 \
   -DWITH_INOTIFY=1 \