From 52ea0cb1e7a86dcc7a4a3d4ea916481d6f5dc6df1d143b13b257c6e3d59bf944 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 6 Sep 2020 13:58:47 +0000
Subject: [PATCH] - Update to release 4.7.0

OBS-URL: https://build.opensuse.org/package/show/network:telephony/libzrtpcpp?expand=0&rev=56
---
 4.7.0.tar.gz       |  3 +++
 V4.6.6.tar.gz      |  3 ---
 libzrtpcpp.changes |  6 ++++++
 libzrtpcpp.spec    | 36 ++++++++++++++----------------------
 4 files changed, 23 insertions(+), 25 deletions(-)
 create mode 100644 4.7.0.tar.gz
 delete mode 100644 V4.6.6.tar.gz

diff --git a/4.7.0.tar.gz b/4.7.0.tar.gz
new file mode 100644
index 0000000..144d23f
--- /dev/null
+++ b/4.7.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:05e451c85755300f84899d7b71c4ed2ef3ed5d272b13019a7aa88c0b51288c35
+size 2235691
diff --git a/V4.6.6.tar.gz b/V4.6.6.tar.gz
deleted file mode 100644
index f0743e2..0000000
--- a/V4.6.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ed70e903082bfa6045e3b2be2f4396cb57d985d59f567ec06ca5b93d894ba42
-size 2233080
diff --git a/libzrtpcpp.changes b/libzrtpcpp.changes
index 306c0f7..9af0475 100644
--- a/libzrtpcpp.changes
+++ b/libzrtpcpp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Sep  6 13:52:09 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 4.7.0
+  * Add a first version of a new SAS algorithm which renders 6 digits
+
 -------------------------------------------------------------------
 Sun Dec 10 23:31:20 UTC 2017 - jengelh@inai.de
 
diff --git a/libzrtpcpp.spec b/libzrtpcpp.spec
index ebdc59f..87cb519 100644
--- a/libzrtpcpp.spec
+++ b/libzrtpcpp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libzrtpcpp
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,29 +12,28 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           libzrtpcpp
 %define lname	libzrtpcpp4
-Version:        4.6.6
+Version:        4.7.0
 Release:        0
 Summary:        A ccrtp extension for ZRTP support
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:          Development/Libraries/C and C++
-Url:            http://www.gnutelephony.org/index.php/GNU_ZRTP
+URL:            http://www.gnutelephony.org/index.php/GNU_ZRTP
 
 #Git-Clone:	git://github.com/wernerd/ZRTPCPP
 #Git-Web:	https://github.com/wernerd/ZRTPCPP
-Source:         https://github.com/wernerd/ZRTPCPP/archive/V%version.tar.gz
+Source:         https://github.com/wernerd/ZRTPCPP/archive/%version.tar.gz
 BuildRequires:  cmake
 BuildRequires:  gcc-c++ >= 4.7
+BuildRequires:  libopenssl-1_0_0-devel
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(libccrtp) >= 2
-BuildRequires:  pkgconfig(libcrypto) < 1.1
 BuildRequires:  pkgconfig(sqlite3) >= 3.7
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 A library that adds RFC6189-compliant ZRTP support to the GNU ccRTP
@@ -63,19 +62,16 @@ This package provides the header files for building applications that
 use libzrtpcpp.
 
 %prep
-%setup -qn ZRTPCPP-%version
+%autosetup -p1 -n ZRTPCPP-%version
 chmod a-x INSTALL
 
 %build
-mkdir build
-pushd build/
-
 # libzrtpcpp changed its API (apparently - can't tell whether aes_init
 # was meant to be exported or not), but failed to bump the SO version.
 # So now, add explicit symbol versions to ensure programs with wrong
 # ABI combinations are caught.
 echo "V_%version { global: *; };" >version.map
-cmake -DCMAKE_INSTALL_PREFIX="%_prefix" \
+%cmake -DCMAKE_INSTALL_PREFIX="%_prefix" \
 	-DCMAKE_C_FLAGS:STRING="%optflags" \
 	-DCMAKE_CXX_FLAGS:STRING="%optflags" \
 	-DCMAKE_LD_FLAGS:STRING="-Wl,--version-script=$PWD/version.map" \
@@ -83,25 +79,21 @@ cmake -DCMAKE_INSTALL_PREFIX="%_prefix" \
 %if "%_lib" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
-	..
-make %{?_smp_mflags} VERBOSE=1
-popd
+
+%cmake_build
 
 %install
-pushd build/
-%make_install
-popd
+%cmake_install
 
 %post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig
 
 %files -n %lname
-%defattr(-,root,root)
-%doc AUTHORS COPYING README.md
+%license COPYING
 %_libdir/libzrtpcpp.so.4*
 
 %files devel
-%defattr(-,root,root)
+%doc AUTHORS README.md
 %_libdir/libzrtpcpp.so
 %_libdir/pkgconfig/libzrtpcpp.pc
 %_includedir/libzrtpcpp/