From 16f9a7446d84e81c392b2bedd3cdacc4ff558463 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Aug 24 2018 16:31:21 +0000 Subject: -devel: move sipconfig/sipdistutils here -devel: drop dep on non-private base pkg (which may go away soon anyway) -devel: move subpkg defs nearer its basepkg in .spec (more) consistently use %python3_pkgversion drop (uneeded) python3_sip_bin.patch --- diff --git a/sip.spec b/sip.spec index e74f5a7..1e62ad5 100644 --- a/sip.spec +++ b/sip.spec @@ -20,7 +20,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.12 -Release: 7%{?dist} +Release: 8%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -40,7 +40,8 @@ Patch50: sip-4.18-no_strip.patch # try not to rpath the world (I *think* this may not be required anymore, since sip-4.19 -- rex) Patch51: sip-4.18-no_rpath.patch # set sip_bin properly for python3 build (needswork to be upstreamable) -Patch52: sip-4.19.3-python3_sip_bin.patch +# no longer needed? keep for a little while before dropping completely -- rex +#Patch52: sip-4.19.3-python3_sip_bin.patch # extracted from sip.h, SIP_API_MAJOR_NR SIP_API_MINOR_NR defines Source1: macros.sip @@ -49,7 +50,6 @@ Source1: macros.sip %global _sip_api %{_sip_api_major}.%{_sip_api_minor} BuildRequires: gcc-c++ -BuildRequires: python2-devel BuildRequires: sed Obsoletes: sip-macros < %{version}-%{release} @@ -68,6 +68,8 @@ class library. %description %_description +# theoretically, nothing should be using a non-private sip anymore +# may drop this subpkg at some point. %package -n python2-sip Summary: %summary Provides: sip-api(%{_sip_api_major}) = %{_sip_api} @@ -77,6 +79,19 @@ Provides: python2-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %{?python_provide:%python_provide python2-sip} %description -n python2-sip %_description +%package -n python2-sip-devel +Summary: Files needed to generate Python bindings for any C++ class library +Requires: sip = %{version}-%{release} +#Requires: python2-sip%{?_isa} = %{version}-%{release} +BuildRequires: python2-devel +Requires: python2-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 +%{summary}. + %package -n python2-pyqt4-sip Summary: %summary Provides: python2-pyqt4-sip-api(%{_sip_api_major}) = %{_sip_api} @@ -92,9 +107,10 @@ Provides: python2-pyqt5-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %description -n python2-pyqt5-sip %_description %if %{with python3} +# theoretically, nothing should be using a non-private sip anymore +# may drop this subpkg at some point. %package -n python%{python3_pkgversion}-sip Summary: SIP - Python 3/C++ Bindings Generator -BuildRequires: python%{python3_pkgversion}-devel Provides: python%{python3_pkgversion}-sip-api(%{_sip_api_major}) = %{_sip_api} Provides: python%{python3_pkgversion}-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %description -n python%{python3_pkgversion}-sip @@ -102,6 +118,15 @@ This is the Python 3 build of SIP. %_description +%package -n python%{python3_pkgversion}-sip-devel +Summary: Files needed to generate Python bindings for any C++ class library +Requires: sip = %{version}-%{release} +#Requires: python3-sip%{?_isa} = %{version}-%{release} +BuildRequires: python%{python3_pkgversion}-devel +Requires: python%{python3_pkgversion}-devel +%description -n python%{python3_pkgversion}-sip-devel +%{summary}. + %package -n python%{python3_pkgversion}-pyqt4-sip Summary: SIP - Python 3/C++ Bindings Generator for pyqt4 BuildRequires: python%{python3_pkgversion}-devel @@ -120,29 +145,8 @@ This is the Python 3 build of pyqt5-SIP. %_description -%package -n python3-sip-devel -Summary: Files needed to generate Python bindings for any C++ class library -Requires: sip = %{version}-%{release} -Requires: python3-sip%{?_isa} = %{version}-%{release} -Requires: python3-devel -%description -n python3-sip-devel -%{summary}. - %endif -%package -n python2-sip-devel -Summary: Files needed to generate Python bindings for any C++ class library -Requires: sip = %{version}-%{release} -Requires: python2-sip%{?_isa} = %{version}-%{release} -Requires: python2-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 -%{summary}. - - %prep @@ -246,13 +250,13 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %files -n python2-sip-devel %{python2_inc}/sip.h +%{python2_sitearch}/sipconfig.py* +%{python2_sitearch}/sipdistutils.py* %files -n python2-sip %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %{python2_sitearch}/sip.* -%{python2_sitearch}/sipconfig.py* -%{python2_sitearch}/sipdistutils.py* %{python2_sitearch}/sip-%{version}.dist-info/ %files -n python2-pyqt4-sip @@ -271,16 +275,16 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %if %{with python3} %files -n python%{python3_pkgversion}-sip-devel %{python3_inc}/sip.h +%{python3_sitearch}/sipconfig.py* +%{python3_sitearch}/sipdistutils.py* +%{python3_sitearch}/__pycache__/* +%exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack %files -n python%{python3_pkgversion}-sip %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %{python3_sitearch}/sip.* -%{python3_sitearch}/sipconfig.py* -%{python3_sitearch}/sipdistutils.py* %{python3_sitearch}/sip-%{version}.dist-info/ -%{python3_sitearch}/__pycache__/* -%exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack %files -n python%{python3_pkgversion}-pyqt4-sip %doc NEWS README @@ -303,6 +307,13 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Fri Aug 24 2018 Rex Dieter - 4.19.12-8 +- -devel: move sipconfig/sipdistutils here +- -devel: drop dep on non-private base pkg (which may go away soon anyway) +- -devel: move subpkg defs nearer its basepkg in .spec +- (more) consistently use %%python3_pkgversion +- drop (uneeded) python3_sip_bin.patch + * Tue Aug 14 2018 Rex Dieter - 4.19.12-7 - include dist-info (#1524189)