Rebuilt for Python 3.8

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

botan.spec

@@ -1,15 +1,10 @@
 %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:        15%{?dist}
 Summary:        Crypto library written in C++
 
-Group:          System Environment/Libraries
 License:        BSD
 URL:            http://botan.randombit.net/
 # tarfile is stripped using repack.sh. original tarfile to be found
@@ -24,29 +19,15 @@ 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
-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,16 +42,10 @@ 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
-Requires:       compat-openssl10-devel
-%else
-Requires:       openssl-devel
-%endif
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -79,7 +54,6 @@ developing applications that use %{name}.
 
 %package        doc
 Summary:        Documentation for %{name}
-Group:          Documentation
 BuildArch:      noarch
 
 %description    doc
@@ -88,26 +62,8 @@ 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
 %{?python_provide:%python_provide python3-%{name}}
 
 %description -n python3-%{name}
@@ -117,7 +73,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
@@ -131,12 +86,12 @@ rm -rf checks/ec_tests.cpp
 
 %build
 # we have the necessary prerequisites, so enable optional modules
-%global enable_modules bzip2,zlib,openssl
+%global enable_modules bzip2,zlib
 
 # 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 +103,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
+     BOOST_PYTHON=boost_python%{python3_version_nodots}
 
 %install
 make install \
@@ -177,15 +119,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 +176,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 +191,30 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate
 
 
 %changelog
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.10.17-15
+- Rebuilt for Python 3.8
+
+* Wed Aug 14 2019 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.17-14
+- Remove dependency on OpenSSL (for F31+).
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.17-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.17-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jan 30 2019 Jonathan Wakely <jwakely@redhat.com> - 1.10.17-11
+- Use %%{python3_version_nodots} for Boost.Python library name
+
+* Tue Jan 29 2019 Jonathan Wakely <jwakely@redhat.com> - 1.10.17-11
+- Use boost_python37 for library name
+
+* Thu Jan 24 2019 Jonathan Wakely <jwakely@redhat.com> - 1.10.17-11
+- Rebuilt for Boost 1.69
+
+* Tue Sep 18 2018 Miro Hrončok <mhroncok@redhat.com> - 1.10.17-10
+- Remove Python 2 subpackage (#1627321)
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.17-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild