[packages/python3] - versioned Obsoletes - clean after -devel-src removed in 3.2 - updated info bcond

[qboosh]

commit 703efa4d548587a5ce9b7e09ddd773e27bab02cc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Mar 1 21:57:01 2022 +0100

    - versioned Obsoletes
    - clean after -devel-src removed in 3.2
    - updated info bcond

 python3.spec | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)
---
diff --git a/python3.spec b/python3.spec
index 7b3165b..d168a00 100644
--- a/python3.spec
+++ b/python3.spec
@@ -233,8 +233,8 @@ Provides:	python(abi) = %{py_ver}
 # for compatibility with existing Ac packages
 Provides:	python(bytecode) = %{py_ver}
 Provides:	python3-enum
-Obsoletes:	python3-enum
-%{!?with_info:Obsoletes: python3-doc-info}
+Obsoletes:	python3-enum < 0.5
+%{!?with_info:Obsoletes:	python3-doc-info < %{epoch}:%{version}-%{release}}
 
 %description libs
 Python shared library and very essental modules for Python binary.
@@ -249,7 +249,7 @@ Summary(pl.UTF-8):	Moduły języka Python
 Group:		Libraries/Python
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 %{?with_system_mpdecimal:Requires:	mpdecimal >= 2.4.2-2}
-Obsoletes:	python3-modules-sqlite
+Obsoletes:	python3-modules-sqlite < 1:3.1-2
 %requires_ge_to	openssl openssl-devel
 
 %description modules
@@ -294,6 +294,7 @@ Summary(tr.UTF-8):	Python ile geliştirme yapmak için gerekli dosyalar
 Summary(uk.UTF-8):	Бібліотеки та хедери для програмування на мові Python
 Group:		Development/Languages/Python
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Obsoletes:	python3-devel-src < 1:3.2-1
 
 %description devel
 The Python interpreter is relatively easy to extend with dynamically
@@ -346,18 +347,6 @@ dosyalarını ve kitaplıkları içerir.
 розширень з динамічною загрузкою та вбудовується в інші програми. Цей
 пакет містить хедери та бібліотеки, необхідні для обох цих задач.
 
-%package devel-src
-Summary:	Python module sources
-Summary(pl.UTF-8):	Pliki źródłowe modułów Pythona
-Group:		Development/Languages/Python
-Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
-
-%description devel-src
-Python module sources.
-
-%description devel-src -l pl.UTF-8
-Pliki źródłowe modułów Pythona.
-
 %package devel-tools
 Summary:	Python development tools
 Summary(pl.UTF-8):	Narzędzia programistyczne języka Python
@@ -595,6 +584,11 @@ WITHIN_PYTHON_RPM_BUILD=1 %{__make} test \
 	TESTOPTS="%{test_flags} %{test_list}"
 %endif
 
+%if %{with info}
+%{__make} -C Doc texinfo
+%{__make} -C Doc/build/texinfo info
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pkgconfigdir}} \
@@ -608,8 +602,7 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pkgconfigdir}} \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with info}
-%{__make} -C Doc/info
-cp -p Doc/info/python*info* $RPM_BUILD_ROOT%{_infodir}
+cp -p Doc/build/texinfo/python*info* $RPM_BUILD_ROOT%{_infodir}
 %endif
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -1387,7 +1380,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with info}
 %files doc-info
 %defattr(644,root,root,755)
-%{_infodir}/*.info*
+%{_infodir}/python.info*
 %endif
 
 %if %{with tkinter}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python3.git/commitdiff/703efa4d548587a5ce9b7e09ddd773e27bab02cc