diff --git a/python311.spec b/python311.spec
index 37fae4c..066049d 100644
--- a/python311.spec
+++ b/python311.spec
@@ -37,6 +37,11 @@
 %endif
 
 %define         python_pkg_name python311
+%if "%{python_pkg_name}" == "%{primary_python}"
+%define primary_interpreter 1
+%else
+%define primary_interpreter 0
+%endif
 
 %if 0%{?sle_version} && 0%{?suse_version} < 1550
 # Obsoleting previous "latest" Python versions
@@ -211,7 +216,7 @@ Recommends:     %{python_pkg_name}-curses
 Recommends:     %{python_pkg_name}-dbm
 Recommends:     %{python_pkg_name}-pip
 %obsolete_python_versioned
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 Provides:       python3 = %{python_version}
 %endif
 %endif
@@ -234,7 +239,7 @@ development environment (python3-idle).
 Summary:        TkInter, a Python Tk Interface
 Requires:       %{python_pkg_name} = %{version}
 %obsolete_python_versioned tk
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 Provides:       python3-tk = %{version}
 %endif
 
@@ -245,7 +250,7 @@ Python interface to Tk. Tk is the GUI toolkit that comes with Tcl.
 Summary:        Python Interface to the (N)Curses Library
 Requires:       %{python_pkg_name} = %{version}
 %obsolete_python_versioned curses
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 Provides:       python3-curses
 %endif
 
@@ -257,7 +262,7 @@ Console User Interface.
 Summary:        Python Interface to the GDBM Library
 Requires:       %{python_pkg_name} = %{version}
 %obsolete_python_versioned dbm
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 Provides:       python3-dbm
 %endif
 
@@ -270,7 +275,7 @@ Summary:        An Integrated Development Environment for Python
 Requires:       %{python_pkg_name} = %{version}
 Requires:       %{python_pkg_name}-tk
 %obsolete_python_versioned idle
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 Provides:       python3-idle = %{version}
 %endif
 
@@ -284,7 +289,7 @@ a debugger.
 Summary:        Package Documentation for Python 3
 Enhances:       %{python_pkg_name} = %{python_version}
 %obsolete_python_versioned doc
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 Provides:       python3-doc = %{version}
 %endif
 
@@ -296,7 +301,7 @@ Python, and Macintosh Module Reference in HTML format.
 %package -n %{python_pkg_name}-doc-devhelp
 Summary:        Additional Package Documentation for Python 3 in devhelp format
 %obsolete_python_versioned doc-devhelp
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 Provides:       python3-doc-devhelp = %{version}
 %endif
 
@@ -323,7 +328,7 @@ Provides:       %{python_pkg_name}-typing = %{version}
 %obsolete_python_versioned typing
 # python3-xml was merged into python3, now moved into -base
 Provides:       %{python_pkg_name}-xml = %{version}
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 Provides:       python3-asyncio = %{version}
 Obsoletes:      python3-asyncio < %{version}
 Provides:       python3-base = %{version}
@@ -351,7 +356,7 @@ Requires:       %{python_pkg_name}-base = %{version}
 Provides:       %{python_pkg_name}-2to3 = %{version}
 Provides:       %{python_pkg_name}-demo = %{version}
 %obsolete_python_versioned tools
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 Provides:       python3-2to3 = %{version}
 Provides:       python3-demo = %{version}
 Provides:       python3-tools = %{version}
@@ -367,7 +372,7 @@ and a set of demonstration programs.
 Summary:        Include Files and Libraries Mandatory for Building Python Modules
 Requires:       %{python_pkg_name}-base = %{version}
 %obsolete_python_versioned devel
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 Provides:       python3-devel = %{version}
 %endif
 
@@ -387,7 +392,7 @@ Summary:        Unit tests for Python and its standard library
 Requires:       %{python_pkg_name} = %{version}
 Requires:       %{python_pkg_name}-tk = %{version}
 %obsolete_python_versioned testsuite
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 Provides:       python3-testsuite = %{version}
 %endif
 
@@ -431,7 +436,7 @@ other applications.
 # drop Autoconf version requirement
 sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac
 
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 # fix shebangs - convert /usr/local/bin/python and /usr/bin/env/python to /usr/bin/python3
 for dir in Lib Tools; do
     # find *.py, filter to files that contain bad shebangs
@@ -691,7 +696,7 @@ rm -fv %{buildroot}%{dynlib nis}
 ln -sf python%{python_version} %{buildroot}%{_bindir}/python3
 
 # decide to ship python3 or just python3.X
-%if "%{python_pkg_name}" != "%{primary_python}"
+%if !%{primary_interpreter}
 # base
 rm %{buildroot}%{_bindir}/python3
 rm %{buildroot}%{_bindir}/pydoc3
@@ -709,7 +714,7 @@ ln -s ../../libpython%{python_abi}.so %{buildroot}%{_libdir}/python%{python_vers
 rm %{buildroot}%{_bindir}/idle3*
 
 # delete the generic 2to3 binary if we are not primary
-%if "%{python_pkg_name}" != "%{primary_python}"
+%if !%{primary_interpreter}
 rm %{buildroot}%{_bindir}/2to3
 %endif
 
@@ -739,7 +744,7 @@ install -m 755 -D Tools/gdb/libpython.py %{buildroot}%{_datadir}/gdb/auto-load/%
 #cp Makefile Makefile.pre.in Makefile.pre $RPM_BUILD_ROOT%{sitedir}/config-%{python_abi}/
 
 # RPM macros
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/
 install -m 644 %{SOURCE7} %{buildroot}%{_rpmconfigdir}/macros.d/ # macros.python3
 %endif
@@ -841,7 +846,7 @@ echo %{sitedir}/_import_failed > %{buildroot}/%{sitedir}/site-packages/zzzz-impo
 %files -n %{python_pkg_name}-tools
 %defattr(644, root, root, 755)
 %{sitedir}/turtledemo
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 %{_bindir}/2to3
 %endif
 %attr(755, root, root)%{_bindir}/2to3-%{python_version}
@@ -850,7 +855,7 @@ echo %{sitedir}/_import_failed > %{buildroot}/%{sitedir}/site-packages/zzzz-impo
 %files -n %{python_pkg_name}-devel
 %defattr(644, root, root, 755)
 %{_libdir}/libpython%{python_abi}.so
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 %{_libdir}/libpython3.so
 %endif
 %{_libdir}/pkgconfig/*
@@ -858,7 +863,7 @@ echo %{sitedir}/_import_failed > %{buildroot}/%{sitedir}/site-packages/zzzz-impo
 %{sitedir}/config-%{python_abi}-*
 %defattr(755, root, root)
 %{_bindir}/python%{python_abi}-config
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 %{_bindir}/python3-config
 %endif
 # Own these directories to not depend on gdb
@@ -891,14 +896,14 @@ echo %{sitedir}/_import_failed > %{buildroot}/%{sitedir}/site-packages/zzzz-impo
 %doc %{_docdir}/%{name}/README.rst
 %license LICENSE
 %doc %{_docdir}/%{name}/README.SUSE
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 %{_mandir}/man1/python3.1%{?ext_man}
 %endif
 %{_mandir}/man1/python%{python_version}.1%{?ext_man}
 # license text, not a doc because the code can use it at run-time
 %{sitedir}/LICENSE.txt
 # RPM macros
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 %{_rpmconfigdir}/macros.d/macros.python3
 %endif
 # binary parts
@@ -1007,7 +1012,7 @@ echo %{sitedir}/_import_failed > %{buildroot}/%{sitedir}/site-packages/zzzz-impo
 %{sitedir}/_import_failed
 %{sitedir}/site-packages/zzzz-import-failed-hooks.pth
 # symlinks
-%if "%{python_pkg_name}" == "%{primary_python}"
+%if %{primary_interpreter}
 %{_bindir}/python3
 %{_bindir}/pydoc3
 %endif