Merge branch 'master' into epel7

- Added ppc64le arch support (Brent Baude <baude@us.ibm.com>)
  - Added AArch64 arch support (Marcin Juszkiewicz
    <mjuszkiewicz@redhat.com>, Peter Robinson <pbrobinson@gmail.com>)
  - Re-enable IDEA (rhbz#1003052) and SRP-6 Modernize spec file New
  - -doc subpackage containing HTML documentation Package Python
  - binding

botan.spec

@@ -1,10 +1,15 @@
 %global major_version 1.10
 
+%if 0%{?fedora} || 0%{?rhel} > 7
+%global with_python3 1
+%endif
+
 Name:           botan
 Version:        %{major_version}.17
-Release:        15%{?dist}
+Release:        1%{?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
@@ -19,15 +24,29 @@ Patch1:         botan-boost_python.patch
 Patch2:         botan-1.10.13-python-init.patch
 
 BuildRequires:  gcc-c++
+BuildRequires:  python2
+BuildRequires:  python2-devel
+BuildRequires:  boost-python-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}}
 
@@ -42,10 +61,16 @@ 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
@@ -54,6 +79,7 @@ developing applications that use %{name}.
 
 %package        doc
 Summary:        Documentation for %{name}
+Group:          Documentation
 BuildArch:      noarch
 
 %description    doc
@@ -62,8 +88,26 @@ 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}
@@ -73,6 +117,7 @@ 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
@@ -84,14 +129,15 @@ interfaces may change in the future.
 # These tests will fail.
 rm -rf checks/ec_tests.cpp
 
+
 %build
 # we have the necessary prerequisites, so enable optional modules
-%global enable_modules bzip2,zlib
+%global enable_modules bzip2,zlib,openssl
 
 # fixme: maybe disable unix_procs, very slow.
 %global disable_modules gnump
 
-%{__python3} ./configure.py \
+./configure.py \
         --prefix=%{_prefix} \
         --libdir=%{_lib} \
         --cc=gcc \
@@ -103,14 +149,27 @@ 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_python%{python3_version_nodots}
+     BOOST_PYTHON=boost_python3
+mv build/python{,3} ; mv build/python{2,}
+%endif # with_python3
 
 %install
 make install \
@@ -120,8 +179,14 @@ make install \
      INSTALL_CMD_DATA="install -p -m 644"
 
 make -f Makefile.python install \
-     PYTHON_SITE_PACKAGE_DIR=%{buildroot}%{python3_sitearch}
+     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 {} \;
@@ -132,10 +197,10 @@ cp -a %{SOURCE1} %{buildroot}%{_pkgdocdir}
 rm -r %{buildroot}%{_pkgdocdir}/manual/{.doctrees,.buildinfo}
 
 
-%ldconfig_post
+%post -p /sbin/ldconfig
 
 
-%ldconfig_postun
+%postun -p /sbin/ldconfig
 
 
 %files
@@ -176,8 +241,14 @@ 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
@@ -191,54 +262,6 @@ 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
-
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1.10.17-8
-- Rebuilt for Python 3.7
-
-* Fri Jun 29 2018 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.17-7
-- Use ldconfig scriptlet macros.
-
-* Fri Jun 29 2018 Miro Hrončok <mhroncok@redhat.com> - 1.10.17-6
-- Rebuilt for Python 3.7
-
-* Thu Jun 28 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1.10.17-5
-- Switch BR boost-python-devel to boost-python2-devel
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.10.17-4
-- Rebuilt for Python 3.7
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.17-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Jan 23 2018 Jonathan Wakely <jwakely@redhat.com> - 1.10.17-2
-- Rebuilt for Boost 1.66
-
 * Mon Oct  2 2017 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.17-1
 - Update to 1.10.17.
 - Remove obsolete patches.
@@ -295,72 +318,26 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate
 - Mark license.txt with %%license.
 - Change %%define -> %%global.
 
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.9-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+* Thu Feb 26 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.9-4
+- Update to 1.10.9, based on the current rawhide spec file, also
+  containing these changes:
+  - Re-enable cleared ECC (spot@fedoraproject.org)
+  - Disable gmp engine (rhbz#1116406)
+  - Use _pkgdocdir
 
-* Thu Jan 14 2016 Jonathan Wakely <jwakely@redhat.com> - 1.10.9-9
-- Rebuilt for Boost 1.60
+* Wed Jun  4 2014 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.8-5
+- Update to 1.10.8, based on the current rawhide spec file, also
+  containing these changes:
+  - Added ppc64le arch support (Brent Baude <baude@us.ibm.com>)
+  - Added AArch64 arch support (Marcin Juszkiewicz
+    <mjuszkiewicz@redhat.com>, Peter Robinson <pbrobinson@gmail.com>)
+  - Re-enable IDEA (rhbz#1003052) and SRP-6
+  - Modernize spec file
+  - New-doc subpackage containing HTML documentation
+  - Package Python binding
 
-* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 1.10.9-8
-- Rebuilt for Boost 1.59
-
-* Fri Jul 24 2015 David Tardon <dtardon@redhat.com> - 1.10.9-7
-- rebuild for Boost 1.58
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.9-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Thu Apr 23 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.9-5
-- Rebuild for gcc5.
-
-* Fri Feb  6 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.9-4
-- Re-enable cleared ECC. Patch by Tom Callaway <spot@fedoraproject.org>.
-
-* Thu Feb  5 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.9-3
-- Disable gmp engine (see bug 1116406).
-- Use _pkgdocdir.
-
-* Thu Feb  5 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.9-2
-- Remove workaround for bug 1186014.
-
-* Sat Jan 31 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.9-1
-- Update to 1.10.9.
-
-* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.8-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.8-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat May 31 2014 Björn Esser <bjoern.esser@gmail.com> - 1.10.8-5
-- rebuild for boost 1.55.0 (libboost_python.so.1.55.0)
-
-* Sun May 25 2014 Brent Baude <baude@us.ibm.com> - 1.10.8-4
-- Added ppc64le arch support
-
-* Fri May 23 2014 David Tardon <dtardon@redhat.com> - 1.10.8-3
-- rebuild for boost 1.55.0
-
-* Mon May 12 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1.10.8-2
-- Added AArch64 architecture support
-
-* Sat May 10 2014 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.8-1
-- Update to 1.10.8.
-
-* Tue Sep  3 2013 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.5-4
-- Re-enable IDEA (rhbz#1003052) and SRP-6.
-
-* Sat Jul 27 2013 Petr Machata <pmachata@redhat.com> - 1.10.5-3
-- Rebuild for boost 1.54.0
-
-* Fri Jul 26 2013 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.5-2
-- Rename the subpackage for the Python binding.
-
-* Fri Jul 26 2013 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.5-1
-- Update to 1.10.5.
-- Modernize spec file.
-- New -doc subpackage containing HTML documentation.
-- Package Python binding.
+* Sat May 10 2014 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.14-3
+- Add patch to fix prime testing.
 
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild