From 81d4d88c1734e3371c4d3b0f20db7cfe8863743acd6a107322839b5b77d0e9a9 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 17 Mar 2015 20:01:35 +0000
Subject: [PATCH] zrtpcpp-4.3.1

OBS-URL: https://build.opensuse.org/package/show/network:telephony/libzrtpcpp?expand=0&rev=39
---
 V4.3.1.tar.gz           |  3 +++
 libzrtpcpp-4.2.4.tar.xz |  3 ---
 libzrtpcpp.changes      | 11 ++++++++++
 libzrtpcpp.spec         | 45 +++++++++++++++++++++--------------------
 4 files changed, 37 insertions(+), 25 deletions(-)
 create mode 100644 V4.3.1.tar.gz
 delete mode 100644 libzrtpcpp-4.2.4.tar.xz

diff --git a/V4.3.1.tar.gz b/V4.3.1.tar.gz
new file mode 100644
index 0000000..6a65d46
--- /dev/null
+++ b/V4.3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d9cce8ba5946620ce030a6b04f58c4011cbd1deb79ee41a6b8999dc6b689604c
+size 1928961
diff --git a/libzrtpcpp-4.2.4.tar.xz b/libzrtpcpp-4.2.4.tar.xz
deleted file mode 100644
index 28ec15c..0000000
--- a/libzrtpcpp-4.2.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:21d382964f3070a148a3ec5f556295854525f7b34e70028d3512897a47b5b146
-size 1279984
diff --git a/libzrtpcpp.changes b/libzrtpcpp.changes
index 2fe4471..0da9c0d 100644
--- a/libzrtpcpp.changes
+++ b/libzrtpcpp.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Mar 17 19:57:23 UTC 2015 - jengelh@inai.de
+
+- Update to new upstream release 4.3.1
+* This version adds some new API that provide to set retry timer 
+  values and to get some retry counters.
+* Application may now set some values of the retry counters during 
+  the discovery (Hello) and the negotiation phase. Applications may
+  increase the number of retries or modify the capping to support 
+  slow or bad networks.
+
 -------------------------------------------------------------------
 Sat Oct 25 12:46:04 UTC 2014 - jengelh@inai.de
 
diff --git a/libzrtpcpp.spec b/libzrtpcpp.spec
index 50e6ef0..4ec37f8 100644
--- a/libzrtpcpp.spec
+++ b/libzrtpcpp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libzrtpcpp
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 Name:           libzrtpcpp
 %define lname	libzrtpcpp4
-Version:        4.2.4
+Version:        4.3.1
 Release:        0
 Summary:        A ccrtp extension for ZRTP support
 License:        GPL-3.0+
@@ -26,15 +26,13 @@ Group:          Development/Libraries/C and C++
 Url:            http://www.gnutelephony.org/index.php/GNU_ZRTP
 
 #Git-Clone:	git://github.com/wernerd/ZRTPCPP
-#Snapshot:	V4.2.4
-# No longer produces release tarballs since 3.x.
-Source:         %name-%version.tar.xz
+#Git-Web:	https://github.com/wernerd/ZRTPCPP
+Source:         https://github.com/wernerd/ZRTPCPP/archive/V%version.tar.gz
 Source2:        %name.keyring
 Patch1:         0001-pkg-config-add-includedir-libzrtcpp-to-CFLAGS.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++ >= 4.7
-BuildRequires:  pkgconfig
-BuildRequires:  xz
+BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(libccrtp) >= 2
 BuildRequires:  pkgconfig(libcrypto) >= 0.9.8
 BuildRequires:  pkgconfig(sqlite3) >= 3.7
@@ -59,7 +57,7 @@ applications.
 %package devel
 Summary:        Headers and link library for libzrtpcpp
 Group:          Development/Libraries/C and C++
-Requires:       %{lname} = %{version}
+Requires:       %lname = %version
 Requires:       ccrtp-devel >= 2.0.0
 
 %description devel
@@ -67,46 +65,49 @@ This package provides the header files, link libraries, and
 documentation for building applications that use libzrtpcpp.
 
 %prep
-%setup -qn ZRTPCPP
+%setup -qn ZRTPCPP-%version
 %patch -P 1 -p1
+chmod a-x NEWS
 
 %build
 mkdir build
-cd 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} \
-      -DCMAKE_C_FLAGS:STRING="%{optflags}" \
-      -DCMAKE_CXX_FLAGS:STRING="%{optflags}" \
-      -DCMAKE_LD_FLAGS:STRING="-Wl,--version-script=$PWD/version.map" \
-      -DCRYPTO_STANDALONE:BOOL=false \
-%if "%{_lib}" == "lib64"
+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" \
+-DCRYPTO_STANDALONE:BOOL=false \
+%if "%_lib" == "lib64"
       -DLIB_SUFFIX=64 \
 %endif
       ..
 
 make %{?_smp_mflags} VERBOSE=1
+popd
 
 %install
-cd build
-make install DESTDIR="%buildroot"
+pushd build/
+%make_install
+popd
 
 %post   -p /sbin/ldconfig -n %lname
 %postun -p /sbin/ldconfig -n %lname
 
 %files -n %lname
 %defattr(-,root,root,0755)
-%doc AUTHORS COPYING README.md
+%doc AUTHORS COPYING NEWS README.md
 %_libdir/libzrtpcpp.so.4*
 
 %files devel
 %defattr(-,root,root,0755)
-%{_libdir}/libzrtpcpp.so
-%{_libdir}/pkgconfig/libzrtpcpp.pc
-%{_includedir}/libzrtpcpp/
+%_libdir/libzrtpcpp.so
+%_libdir/pkgconfig/libzrtpcpp.pc
+%_includedir/libzrtpcpp/
 
 %changelog