From 1009c058fc20bd5b6c88cea624a1512a0dfd17efce619610634452a878b99f39 Mon Sep 17 00:00:00 2001 From: Adam Mizerski Date: Wed, 15 Feb 2023 20:09:53 +0000 Subject: [PATCH] Accepting request 1066049 from home:etamPL:branches:devel:tools:scm fixed building with openssl-3 OBS-URL: https://build.opensuse.org/request/show/1066049 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/git-crypt?expand=0&rev=5 --- git-crypt-0.7.0.tar.gz | 3 --- git-crypt.changes | 5 +++++ git-crypt.spec | 11 ++++++++--- 3 files changed, 13 insertions(+), 6 deletions(-) delete mode 100644 git-crypt-0.7.0.tar.gz diff --git a/git-crypt-0.7.0.tar.gz b/git-crypt-0.7.0.tar.gz deleted file mode 100644 index ac58e04..0000000 --- a/git-crypt-0.7.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:50f100816a636a682404703b6c23a459e4d30248b2886a5cf571b0d52527c7d8 -size 57621 diff --git a/git-crypt.changes b/git-crypt.changes index 4d61d87..d5bad5a 100644 --- a/git-crypt.changes +++ b/git-crypt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 11 11:10:29 UTC 2023 - Adam Mizerski + +- fixed building with openssl-3 + ------------------------------------------------------------------- Sat Apr 23 08:58:51 UTC 2022 - Adam Mizerski diff --git a/git-crypt.spec b/git-crypt.spec index 62dc7ed..73658f5 100644 --- a/git-crypt.spec +++ b/git-crypt.spec @@ -1,7 +1,7 @@ # # spec file for package git-crypt # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -45,9 +45,14 @@ down your entire repository. %setup -q %build +CXXFLAGS="-std=c++11 %{optflags}" +# https://github.com/AGWA/git-crypt/issues/232 +%if %{pkg_version_cmp libopenssl-devel 3} != -1 +CXXFLAGS="${CXXFLAGS} -DOPENSSL_API_COMPAT=0x30000000L" +%endif +export CXXFLAGS make %{?_smp_mflags} \ - ENABLE_MAN=yes \ - CXXFLAGS="-std=c++11 %{optflags}" + ENABLE_MAN=yes %install %make_install \