diff --git a/sip.spec b/sip.spec index 19f6251d60..679ffe0226 100644 --- a/sip.spec +++ b/sip.spec @@ -17,7 +17,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.6 -Release: 2%{?dist} +Release: 3%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -42,29 +42,45 @@ Source1: macros.sip %global _sip_api_minor 3 %global _sip_api %{_sip_api_major}.%{_sip_api_minor} -Provides: sip-api(%{_sip_api_major}) = %{_sip_api} -Provides: sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} - BuildRequires: python2-devel BuildRequires: sed -%description -SIP is a tool for generating bindings for C++ classes so that they can be -accessed as normal Python classes. SIP takes many of its ideas from SWIG but, -because it is specifically designed for C++ and Python, is able to generate -tighter bindings. SIP is so called because it is a small SWIG. - -SIP was originally designed to generate Python bindings for KDE and so has -explicit support for the signal slot mechanism used by the Qt/KDE class -libraries. However, SIP can be used to generate Python bindings for any C++ +%global _description\ +SIP is a tool for generating bindings for C++ classes so that they can be\ +accessed as normal Python classes. SIP takes many of its ideas from SWIG but,\ +because it is specifically designed for C++ and Python, is able to generate\ +tighter bindings. SIP is so called because it is a small SWIG.\ +\ +SIP was originally designed to generate Python bindings for KDE and so has\ +explicit support for the signal slot mechanism used by the Qt/KDE class\ +libraries. However, SIP can be used to generate Python bindings for any C++\ class library. -%package devel +%description %_description + +%package -n python2-sip +Summary: %summary +Provides: sip-api(%{_sip_api_major}) = %{_sip_api} +Provides: sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} +%{?python_provide:%python_provide python2-sip} +# Remove before F30 +Provides: sip = %{version}-%{release} +Provides: sip%{?_isa} = %{version}-%{release} +Obsoletes: sip < %{version}-%{release} + +%description -n python2-sip %_description + +%package -n python2-sip-devel Summary: Files needed to generate Python bindings for any C++ class library -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: python2-sip-%{name}%{?_isa} = %{version}-%{release} Requires: %{name}-macros = %{version}-%{release} Requires: python2-devel -%description devel +# Remove before F30 +Provides: sip-devel = %{version}-%{release} +Provides: sip-devel%{?_isa} = %{version}-%{release} +Obsoletes: sip-devel < %{version}-%{release} + +%description -n python2-sip-devel This package contains files needed to generate Python bindings for any C++ classes library. @@ -89,15 +105,7 @@ Provides: python3-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %description -n python3-sip This is the Python 3 build of SIP. -SIP is a tool for generating bindings for C++ classes so that they can be -accessed as normal Python 3 classes. SIP takes many of its ideas from SWIG but, -because it is specifically designed for C++ and Python, is able to generate -tighter bindings. SIP is so called because it is a small SWIG. - -SIP was originally designed to generate Python bindings for KDE and so has -explicit support for the signal slot mechanism used by the Qt/KDE class -libraries. However, SIP can be used to generate Python 3 bindings for any C++ -class library. +%_description %package -n python3-sip-devel Summary: Files needed to generate Python 3 bindings for any C++ class library @@ -163,13 +171,13 @@ mkdir -p %{buildroot}%{_datadir}/sip install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip -%files +%files -n python2-sip %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %{python2_sitearch}/sip.so %{python2_sitearch}/sip*.py* -%files devel +%files -n python2-sip-devel %{_bindir}/sip %{_datadir}/sip/ %{python2_inc}/sip.h @@ -196,6 +204,10 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Sun Dec 17 2017 Zbigniew Jędrzejewski-Szmek - 4.19.6-3 +- Python 2 binary packages renamed to python2-sip and python2-sip-devel + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + * Mon Dec 11 2017 Merlin Mathesius - 4.19.6-2 - Cleanup spec file conditionals