From e1b565f728a834a1e45adbbcd33b741a0ff7ac59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 19 Aug 2017 12:54:26 -0400 Subject: [PATCH] Revert "Python 2 binary package renamed to python2-libpst" This reverts commit 032f7b517b6f6c0b7a330aec2128b75fd93b80b7. Carl Byington wrote: > Those changes are only in the %if fedora <= 25 side. I think you > intended those to be in the %if fedora > 25 parts of the spec file. --- libpst.spec | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libpst.spec b/libpst.spec index bd9d174..f9ee1da 100644 --- a/libpst.spec +++ b/libpst.spec @@ -42,11 +42,7 @@ utilities. %package python2 Requires: python2 %else -%package -n python2-libpst -%{?python_provide:%python_provide python2-libpst} -# Remove before F30 -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} +%package python Requires: python %endif Summary: Python bindings for libpst @@ -66,7 +62,7 @@ Requires: %{name}-libs = %{version}-%{release} %if 0%{?fedora} > 25 %description python2 %else -%description -n python2-libpst +%description python %endif The libpst-python package allows you to use the libpst shared object from python code. @@ -154,7 +150,7 @@ rm -rf $RPM_BUILD_ROOT %exclude %{python2_sitearch}/*.a %exclude %{python2_sitearch}/*.la %else -%files -n python2-libpst +%files python %defattr(-,root,root,-) %{python_sitearch}/_*.so %exclude %{python_sitearch}/*.a