From 2eef2ced3b401ffe57ebb8d277f6a6341ae70202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 18 Sep 2018 13:24:13 +0200 Subject: [PATCH] Remove Python 2 subpackage (#1627321) --- botan.spec | 72 +++++++----------------------------------------------- 1 file changed, 9 insertions(+), 63 deletions(-) diff --git a/botan.spec b/botan.spec index 1727451..615c327 100644 --- a/botan.spec +++ b/botan.spec @@ -1,12 +1,8 @@ %global major_version 1.10 -%if 0%{?fedora} || 0%{?rhel} > 7 -%global with_python3 1 -%endif - Name: botan Version: %{major_version}.17 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -24,29 +20,20 @@ Patch1: botan-boost_python.patch Patch2: botan-1.10.13-python-init.patch BuildRequires: gcc-c++ -BuildRequires: python2 -BuildRequires: python2-devel -BuildRequires: boost-python2-devel -%if 0%{?with_python3} BuildRequires: python3 BuildRequires: python3-devel +BuildRequires: python3-sphinx BuildRequires: boost-python3-devel -%endif # with_python3 - -BuildRequires: %{_bindir}/sphinx-build BuildRequires: bzip2-devel BuildRequires: zlib-devel -%if 0%{?fedora} >=26 || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: compat-openssl10-devel %else BuildRequires: openssl-devel %endif # do not check .so files in the python_sitelib directories -%global __provides_exclude_from ^(%{python2_sitearch}/.*\\.so)$ -%if 0%{?with_python3} %global __provides_exclude_from ^(%{python3_sitearch}/.*\\.so)$ -%endif # with_python3 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -61,12 +48,11 @@ flavor of the library. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig Requires: bzip2-devel Requires: zlib-devel -%if 0%{?fedora} >=26 || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 Requires: compat-openssl10-devel %else Requires: openssl-devel @@ -88,23 +74,6 @@ BuildArch: noarch This package contains HTML documentation for %{name}. -%package -n python2-%{name} -Summary: Python2 bindings for %{name} -Group: System Environment/Libraries -%{?python_provide:%python_provide python2-%{name}} -# the python2 package was named botan-python up to 1.10.13-1 -Provides: %{name}-python = %{version}-%{release} -Obsoletes: %{name}-python < 1.10.13-2 - -%description -n python2-%{name} -%{summary} - -This package contains the Python2 binding for %{name}. - -Note: The Python binding should be considered alpha software, and the -interfaces may change in the future. - -%if 0%{?with_python3} %package -n python3-%{name} Summary: Python3 bindings for %{name} Group: System Environment/Libraries @@ -117,7 +86,6 @@ This package contains the Python3 binding for %{name}. Note: The Python binding should be considered alpha software, and the interfaces may change in the future. -%endif # with_python3 %prep @@ -136,7 +104,7 @@ rm -rf checks/ec_tests.cpp # fixme: maybe disable unix_procs, very slow. %global disable_modules gnump -%{__python2} ./configure.py \ +%{__python3} ./configure.py \ --prefix=%{_prefix} \ --libdir=%{_lib} \ --cc=gcc \ @@ -148,27 +116,14 @@ rm -rf checks/ec_tests.cpp --with-python-version=dummy.dummy \ --with-sphinx -%if 0%{?with_python3} -cp -a build/python{,3} -%endif # with_python3 - # (ab)using CXX as an easy way to inject our CXXFLAGS make CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} -make -f Makefile.python \ - CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} \ - PYTHON_INC="$(python2-config --includes)" \ - PYTHON_ROOT=. - -%if 0%{?with_python3} -mv build/python{,2} ; mv build/python{3,} make -f Makefile.python \ CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} \ PYTHON_INC="$(python3-config --includes)" \ PYTHON_ROOT=. \ BOOST_PYTHON=boost_python3 -mv build/python{,3} ; mv build/python{2,} -%endif # with_python3 %install make install \ @@ -177,15 +132,9 @@ make install \ INSTALL_CMD_EXEC="install -p -m 755" \ INSTALL_CMD_DATA="install -p -m 644" -make -f Makefile.python install \ - PYTHON_SITE_PACKAGE_DIR=%{buildroot}%{python2_sitearch} - -%if 0%{?with_python3} -mv build/python{,2} ; mv build/python{3,} make -f Makefile.python install \ PYTHON_SITE_PACKAGE_DIR=%{buildroot}%{python3_sitearch} -mv build/python{,3} ; mv build/python{2,} -%endif # with_python3 + # fixups find doc/examples -type f -exec chmod -x {} \; @@ -240,14 +189,8 @@ rm -r %{buildroot}%{_pkgdocdir}/manual/{.doctrees,.buildinfo} %{_pkgdocdir}/python2-examples -%files -n python2-%{name} -%{python2_sitearch}/%{name} - - -%if 0%{?with_python3} %files -n python3-%{name} %{python3_sitearch}/%{name} -%endif # with_python3 %check @@ -261,6 +204,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Tue Sep 18 2018 Miro Hrončok - 1.10.17-10 +- Remove Python 2 subpackage (#1627321) + * Thu Jul 12 2018 Fedora Release Engineering - 1.10.17-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild