[botan/epel7: 19/19] Merge branch 'master' into epel7

[Thomas Moschny]

commit 8f960bd6389b5f13f8e9a0b56be308efa1561836
Merge: f47d951 953c48e
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sat Feb 14 23:32:32 2015 +0100

    Merge branch 'master' into epel7

 .gitignore                 |   1 +
 botan-1.10.5-ecc-fix.patch | 327 +++++++++++++++++++++++++++++++++++++++++++++
 botan.spec                 |  67 +++++++---
 repack.sh                  |   7 +-
 sources                    |   2 +-
 5 files changed, 375 insertions(+), 29 deletions(-)
---
diff --cc botan.spec
index 35c3257,9fec23c..9715873
--- a/botan.spec
+++ b/botan.spec
@@@ -81,15 -83,17 +83,18 @@@ interfaces may change in the future
  %setup -q -n Botan-%{version}
  %patch0 -p1
  %patch1 -p1
- cp -av %{SOURCE1} .
+ %patch2 -p1 -b .eccfix
+ 
+ # These tests will fail.
+ rm -rf checks/ec_tests.cpp
  
 +
  %build
  # we have the necessary prerequisites, so enable optional modules
- %define enable_modules gnump,bzip2,zlib,openssl
+ %define enable_modules bzip2,zlib,openssl
  
  # fixme: maybe disable unix_procs, very slow.
- %define disable_modules %{nil}
+ %define disable_modules gnump
  
  ./configure.py \
          --prefix=%{_prefix} \
@@@ -169,18 -183,54 +184,26 @@@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} 
  
  
  %changelog
 -* Fri Feb  6 2015 Thomas Moschny <thomas.moschny at gmx.de> - 1.10.9-4
 -- Re-enable cleared ECC. Patch by Tom Callaway <spot at fedoraproject.org>.
 -
 -* Thu Feb  5 2015 Thomas Moschny <thomas.moschny at gmx.de> - 1.10.9-3
 -- Disable gmp engine (see bug 1116406).
 -- Use _pkgdocdir.
 -
 -* Thu Feb  5 2015 Thomas Moschny <thomas.moschny at gmx.de> - 1.10.9-2
 -- Remove workaround for bug 1186014.
 -
 -* Sat Jan 31 2015 Thomas Moschny <thomas.moschny at gmx.de> - 1.10.9-1
 -- Update to 1.10.9.
 -
 -* Fri Aug 15 2014 Fedora Release Engineering <rel-eng at 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 at 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 at 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 at us.ibm.com> - 1.10.8-4
 -- Added ppc64le arch support
 -
 -* Fri May 23 2014 David Tardon <dtardon at redhat.com> - 1.10.8-3
 -- rebuild for boost 1.55.0
 -
 -* Mon May 12 2014 Marcin Juszkiewicz <mjuszkiewicz at redhat.com> - 1.10.8-2
 -- Added AArch64 architecture support
 -
 -* Sat May 10 2014 Thomas Moschny <thomas.moschny at gmx.de> - 1.10.8-1
 -- Update to 1.10.8.
 -
 -* Tue Sep  3 2013 Thomas Moschny <thomas.moschny at gmx.de> - 1.10.5-4
 -- Re-enable IDEA (rhbz#1003052) and SRP-6.
 -
 -* Sat Jul 27 2013 Petr Machata <pmachata at redhat.com> - 1.10.5-3
 -- Rebuild for boost 1.54.0
 -
 -* Fri Jul 26 2013 Thomas Moschny <thomas.moschny at gmx.de> - 1.10.5-2
 -- Rename the subpackage for the Python binding.
 -
 -* Fri Jul 26 2013 Thomas Moschny <thomas.moschny at gmx.de> - 1.10.5-1
 -- Update to 1.10.5.
 -- Modernize spec file.
 -- New -doc subpackage containing HTML documentation.
 -- Package Python binding.
++* Thu Feb 26 2015 Thomas Moschny <thomas.moschny at 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 at fedoraproject.org)
++  - Disable gmp engine (rhbz#1116406)
++  - Use _pkgdocdir
++
 +* Wed Jun  4 2014 Thomas Moschny <thomas.moschny at 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 at us.ibm.com>)
 +  - Added AArch64 arch support (Marcin Juszkiewicz
 +    <mjuszkiewicz at redhat.com>, Peter Robinson <pbrobinson at gmail.com>)
-   - Re-enable IDEA (rhbz#1003052) and SRP-6 Modernize spec file New
-   - -doc subpackage containing HTML documentation Package Python
-   - binding
++  - Re-enable IDEA (rhbz#1003052) and SRP-6
++  - Modernize spec file
++  - New-doc subpackage containing HTML documentation
++  - Package Python binding
 +
 +* Sat May 10 2014 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.14-3
 +- Add patch to fix prime testing.
  
  * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.14-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild