From 91692783d31d5f93bc3da39d07156938fab3269a Mon Sep 17 00:00:00 2001
From: Morten Stevens <mstevens@fedoraproject.org>
Date: Thu, 15 Oct 2020 12:20:51 +0200
Subject: [PATCH] Drop support for pkcs11 and zlib

---
 mbedtls.spec | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/mbedtls.spec b/mbedtls.spec
index 5d619c5..5801da7 100644
--- a/mbedtls.spec
+++ b/mbedtls.spec
@@ -4,7 +4,7 @@
 
 Name: mbedtls
 Version: 2.16.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Light-weight cryptographic and SSL/TLS library
 License: ASL 2.0
 URL: https://tls.mbed.org/
@@ -15,11 +15,6 @@ BuildRequires: cmake
 BuildRequires: doxygen
 BuildRequires: graphviz
 BuildRequires: perl-interpreter
-BuildRequires: pkcs11-helper-devel
-BuildRequires: python3
-BuildRequires: zlib-devel
-
-Requires: pkcs11-helper
 
 # replace polarssl with mbedtls
 
@@ -45,8 +40,6 @@ Cryptographic utilities based on %{name}.
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       pkcs11-helper-devel
-Requires:       zlib-devel
 Obsoletes:      polarssl-devel < 1.3.10
 Provides:       polarssl-devel = %{version}-%{release}
 
@@ -72,19 +65,15 @@ The %{name}-doc package contains documentation.
 %prep
 %autosetup -n %{name}-%{name}-%{version}
 
-sed -i 's|//\(#define MBEDTLS_PKCS11_C\)|\1|' include/mbedtls/config.h
 sed -i 's|//\(#define MBEDTLS_HAVEGE_C\)|\1|' include/mbedtls/config.h
 sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|' include/mbedtls/config.h
 sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' include/mbedtls/config.h
-sed -i 's|//\(#define MBEDTLS_ZLIB_SUPPORT\)|\1|' include/mbedtls/config.h
 
 %build
 
 %cmake \
 	-DCMAKE_BUILD_TYPE=Release \
 	-DLINK_WITH_PTHREAD=ON \
-	-DUSE_PKCS11_HELPER_LIBRARY=ON \
-	-DENABLE_ZLIB_SUPPORT=ON \
 	-DINSTALL_MBEDTLS_HEADERS=ON \
 	-DUSE_SHARED_MBEDTLS_LIBRARY=ON \
 	-DUSE_STATIC_MBEDTLS_LIBRARY=ON
@@ -123,6 +112,9 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls
 %doc apidoc/*
 
 %changelog
+* Thu Oct 15 2020 Morten Stevens <mstevens@fedoraproject.org> - 2.16.8-2
+- Drop support for pkcs11 and zlib
+
 * Tue Sep 08 2020 Morten Stevens <mstevens@fedoraproject.org> - 2.16.8-1
 - Update to 2.16.8