From c9dadca697bd4af9a0dbf59bd0e9c361bacea7b6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jul 11 2018 14:27:51 +0000 Subject: *-devel: Requires: sip. drop Obsoletes: sip, now that we have a real sip pkg again --- diff --git a/sip.spec b/sip.spec index c101555..9410500 100644 --- a/sip.spec +++ b/sip.spec @@ -20,7 +20,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.12 -Release: 1%{?dist} +Release: 2%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -75,11 +75,6 @@ Provides: sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} Provides: python2-sip-api(%{_sip_api_major}) = %{_sip_api} Provides: python2-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-pyqt5-sip @@ -112,16 +107,17 @@ This is the Python 3 build of pyqt5-SIP. %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 @@ -250,6 +246,10 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Wed Jul 11 2018 Rex Dieter - 4.19.12-2 +- *-devel: Requires: sip. +- drop Obsoletes: sip, now that we have a real sip pkg again + * Tue Jul 10 2018 Rex Dieter - 4.19.12-1 - 4.19.12