From 0d2709fa0587438cc6027b019988e3a3f723623e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Adam=20Go=C5=82=C4=99biowski?= Date: Fri, 4 Oct 2019 09:35:13 +0200 Subject: [PATCH] - openssl.patch no longer needed --- clamav-openssl.patch | 18 ------------------ clamav.spec | 10 ++++------ 2 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 clamav-openssl.patch diff --git a/clamav-openssl.patch b/clamav-openssl.patch deleted file mode 100644 index dd8de6e..0000000 --- a/clamav-openssl.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -uNr clamav-0.98.3/m4/reorganization/libs/openssl.m4 clamav-0.98.3-openssl/m4/reorganization/libs/openssl.m4 ---- clamav-0.98.3/m4/reorganization/libs/openssl.m4 2014-05-06 20:39:56.000000000 +0200 -+++ clamav-0.98.3-openssl/m4/reorganization/libs/openssl.m4 2014-05-09 13:51:47.581181238 +0200 -@@ -22,12 +22,12 @@ - AC_MSG_ERROR([OpenSSL not found.]) - fi - --SSL_LDFLAGS="-L$LIBSSL_HOME/lib" -+SSL_LDFLAGS="" - SSL_LIBS="-lssl -lcrypto" - SSL_CPPFLAGS="-I$LIBSSL_HOME/include" - - save_LDFLAGS="$LDFLAGS" --LDFLAGS="-L$LIBSSL_HOME/lib $SSL_LIBS" -+LDFLAGS="$SSL_LDFLAGS $SSL_LIBS" - - save_CFLAGS="$CFLAGS" - CFLAGS="$SSL_CPPFLAGS" diff --git a/clamav.spec b/clamav.spec index 3b192eb..245c55e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -42,10 +42,9 @@ Patch1: %{name}-nolibs.patch Patch2: am-nosilentrules.patch %endif Patch3: ac2.68.patch -Patch4: %{name}-openssl.patch -Patch5: x32.patch -Patch6: %{name}-add-support-for-system-tomsfastmath.patch -Patch7: %{name}-headers.patch +Patch4: x32.patch +Patch5: %{name}-add-support-for-system-tomsfastmath.patch +Patch6: %{name}-headers.patch URL: http://www.clamav.net/ BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1:1.11 @@ -216,10 +215,9 @@ Biblioteki statyczne clamav. %if "%{pld_release}" != "ac" %patch3 -p1 %endif -#%patch4 -p1 +%patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %build export CFLAGS="%{rpmcflags} -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" -- 2.44.0