From cff56015bba2892275903fc55576c77618ab3b32 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 17 Aug 2016 11:43:05 +0200 Subject: [PATCH] Rename python2 and python3 subpackages are per latest guidelines --- libgexiv2.spec | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/libgexiv2.spec b/libgexiv2.spec index 4fe003d..8108fd6 100644 --- a/libgexiv2.spec +++ b/libgexiv2.spec @@ -11,15 +11,15 @@ Patch0: %{name}-pkgconf.patch BuildRequires: exiv2-devel BuildRequires: gobject-introspection-devel BuildRequires: libtool -BuildRequires: python-devel -BuildRequires: pygobject3-base +BuildRequires: python2-devel +BuildRequires: python-gobject-base # For tests BuildRequires: vala vala-tools %if !0%{?rhel} BuildRequires: python3-devel -BuildRequires: python3-gobject +BuildRequires: python3-gobject-base %endif %description @@ -36,21 +36,25 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%package python2 -Summary: Python2 bindings for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: pygobject3-base%{?_isa} +%package -n python2-gexiv2 +Summary: Python2 bindings for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: python-gobject-base%{?_isa} +# For upgrade path from F24 +Obsoletes: libgexiv2-python2 < 0.10.4 -%description python2 +%description -n python2-gexiv2 This package contains the python2 bindings for %{name} %if !0%{?rhel} -%package python3 -Summary: Python3 bindings for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: python3-gobject%{?_isa} +%package -n python3-gexiv2 +Summary: Python3 bindings for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: python3-gobject-base%{?_isa} +# For upgrade path from F24 +Obsoletes: libgexiv2-python3 < 0.10.4 -%description python3 +%description -n python3-gexiv2 This package contains the python3 bindings for %{name} %endif @@ -97,11 +101,11 @@ mv $RPM_BUILD_ROOT%{_datadir}/gir-1.0/GExiv2-0.10.typelib \ %dir %{_datadir}/vala/vapi %{_datadir}/vala/vapi/gexiv2.vapi -%files python2 -%{python_sitearch}/gi/overrides/GExiv2.py* +%files -n python2-gexiv2 +%{python2_sitearch}/gi/overrides/GExiv2.py* %if !0%{?rhel} -%files python3 +%files -n python3-gexiv2 %{python3_sitearch}/gi/overrides/GExiv2.py %{python3_sitearch}/gi/overrides/__pycache__/GExiv2* %endif @@ -110,6 +114,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/gir-1.0/GExiv2-0.10.typelib \ * Mon Aug 15 2016 Kalev Lember - 0.10.4-1 - Update to 0.10.4 - Use license macro for COPYING +- Rename python2 and python3 subpackages are per latest guidelines * Tue Jul 19 2016 Fedora Release Engineering - 0.10.3-7 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages