From 1a7003e813c06df983f8e92be6790e4d36a407e08deff8ef4d940f7d722a45c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Sun, 24 May 2020 07:32:32 +0000
Subject: [PATCH] Accepting request 808417 from
 home:jengelh:branches:security:tls

- Use find -exec +. Replace `pwd` by simply $PWD.
- Drop Obsoletes on libopenssl1*. libopenssl3 has a new SONAME and
  does not conflict with anything previously.

OBS-URL: https://build.opensuse.org/request/show/808417
OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-3?expand=0&rev=8
---
 openssl-3.changes | 7 +++++++
 openssl-3.spec    | 9 +++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/openssl-3.changes b/openssl-3.changes
index c7ec33f..36ddb21 100644
--- a/openssl-3.changes
+++ b/openssl-3.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat May 23 14:06:54 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Use find -exec +. Replace `pwd` by simply $PWD.
+- Drop Obsoletes on libopenssl1*. libopenssl3 has a new SONAME and
+  does not conflict with anything previously.
+
 -------------------------------------------------------------------
 Wed May 20 12:46:24 UTC 2020 - Vítězslav Čížek <vcizek@suse.com>
 
diff --git a/openssl-3.spec b/openssl-3.spec
index 8854584..d1e5578 100644
--- a/openssl-3.spec
+++ b/openssl-3.spec
@@ -64,9 +64,6 @@ OpenSSL contains an implementation of the SSL and TLS protocols.
 %package -n libopenssl3
 Summary:        Secure Sockets and Transport Layer Security
 Recommends:     ca-certificates-mozilla
-# Needed for clean upgrade from former openssl-1_1_0, boo#1081335
-Obsoletes:      libopenssl1_1_0
-Obsoletes:      libopenssl1_1
 
 %description -n libopenssl3
 OpenSSL is a software library to be used in applications that need to
@@ -148,7 +145,7 @@ perl configdata.pm --dump
 %check
 export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
-LD_LIBRARY_PATH=`pwd` make test -j1
+LD_LIBRARY_PATH="$PWD" make test -j1
 # show cyphers
 gcc -o showciphers %{optflags} -I%{buildroot}%{_includedir} %{SOURCE5} -L%{buildroot}%{_libdir} -lssl -lcrypto
 LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./showciphers
@@ -166,7 +163,7 @@ mv %{buildroot}/%{ssletcdir}/misc %{buildroot}/%{_datadir}/ssl/
 # avoid file conflicts with man pages from other packages
 #
 pushd %{buildroot}/%{_mandir}
-find . -type f -exec chmod 644 {} \;
+find . -type f -exec chmod 644 {} +
 # some man pages now contain spaces. This makes several scripts go havoc, among them /usr/sbin/Check.
 # replace spaces by underscores
 #for i in man?/*\ *; do mv -v "$i" "${i// /_}"; done
@@ -191,7 +188,7 @@ done
 popd
 
 # Do not install demo scripts executable under /usr/share/doc
-find demos -type f -perm /111 -exec chmod 644 {} \;
+find demos -type f -perm /111 -exec chmod 644 {} +
 
 # Place showciphers.c for %%doc macro
 cp %{SOURCE5} .