Sync from SUSE:SLFO:1.1 python-sip revision 991b1d2cffaa22fc0490200baee6e28f

python-sip.changes

@@ -1,25 +1,3 @@
--------------------------------------------------------------------
-Tue Nov  5 07:40:38 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Only produce python-sip-doc when the default is SIP4: SIP6 does
-  not provide a -doc package. The previously generated meta package
-  only contained a README flle and no dependencies.
-
--------------------------------------------------------------------
-Mon Nov  4 12:37:01 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Do not rely on %requires_eq macro: it expands too early and newly
-  errors out when the package specified does not exist. In case of
-  python single spec, the rewriting mechanism for the python ->
-  pythonXYZ flavor happens 'too late'.
-
--------------------------------------------------------------------
-Thu Jan 25 20:08:40 UTC 2024 - Ben Greiner <code@bnavigator.de>
-
-- Remove old skip_python2
-- %{?sle15_python_module_pythons} must be declared before first
-  use of %python_module
-
 -------------------------------------------------------------------
 Sat Jun 10 09:45:54 UTC 2023 - ecsos <ecsos@opensuse.org>
 

python-sip.spec

@@ -16,13 +16,14 @@
 #
 
 
-%{?sle15_python_module_pythons}
 # Default is sip6 for all distributions. Be sure to branch both python-sip6 and python-sip into
 # any project using this metapackge.
 %define sipN sip6
 # Assume that all installed python flavors have the same version
 %define Nversion %(rpm -q --qf '%%{version}' --whatprovides $(echo %{python_module %{sipN}-devel}| cut -d " " -f 1))
+%define skip_python2 1
 %define plainpython python
+%{?sle15_python_module_pythons}
 Name:           python-sip
 Version:        %{Nversion}
 Release:        0
@@ -34,7 +35,7 @@ Source0:        README.SUSE
 BuildRequires:  %{python_module %{sipN}-devel}
 BuildRequires:  python-rpm-macros
 BuildArch:      noarch
-Requires:       python-%{sipN} = %{Nversion}
+%requires_eq    python-%{sipN}
 %python_subpackages
 
 %description
@@ -47,7 +48,7 @@ to generate wxPython, the Python bindings for wxWidgets.
 %package devel
 Summary:        A Python bindings generator for C/C++ libraries
 Group:          Development/Libraries/Python
-Requires:       python-%{sipN}-devel = %{Nversion}
+%requires_eq    python-%{sipN}-devel
 
 %description devel
 SIP is a collection of tools that makes it very easy to create Python
@@ -65,7 +66,7 @@ specific version of SIP v<N>.
 Summary:        A Python bindings generator for C/C++ libraries -- common documentation
 Group:          Development/Libraries/Python
 Provides:       %{python_module sip-doc = %{version}-%{release}}
-Requires:       %{plainpython}-%{sipN}-doc = %{Nversion}
+%requires_eq    %{plainpython}-%{sipN}-doc
 
 %description -n python-sip-doc
 SIP is a tool that makes it very easy to create Python bindings for C
@@ -91,12 +92,12 @@ cp %{SOURCE0} .
 # only sip4 still provides the old python-sip package
 %files %{python_files}
 %doc README.SUSE
-
-%files -n python-sip-doc
-%doc README.SUSE
 %endif
 
 %files %{python_files devel}
 %doc README.SUSE
 
+%files -n python-sip-doc
+%doc README.SUSE
+
 %changelog