Jan Engelhardt 2015-08-14 08:30:07 +00:00 committed by Git OBS Bridge
parent 81d4d88c17
commit 8261df73d4
5 changed files with 16 additions and 42 deletions

View File

@ -1,35 +0,0 @@
From f100d9583fb0345ebe91959b9310fed3af1602db Mon Sep 17 00:00:00 2001
X-Git-Clone: git://github.com/tmatth/ZRTPCPP
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Mon, 14 Jul 2014 11:31:17 -0400
Subject: [PATCH] pkg-config: add <includedir>/libzrtcpp to CFLAGS
Also remove broken lines that are not required.
---
libzrtpcpp.pc.cmake | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/libzrtpcpp.pc.cmake b/libzrtpcpp.pc.cmake
index 655bd30..9676c3d 100644
--- a/libzrtpcpp.pc.cmake
+++ b/libzrtpcpp.pc.cmake
@@ -1,15 +1,13 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-pkglibdir=${libdir}/@PACKAGE@
includedir=@includedir@
-pkgincludedir=${includedir}/@PACKAGE@
Name: libzrtpcpp
Description: GNU ZRTP core library
Version: @VERSION@
Requires: @CRYPTOBACKEND@
Libs: -L${libdir} -l@zrtplibName@
-Cflags: -I${includedir}
+Cflags: -I${includedir} -I${includedir}/libzrtpcpp
--
2.0.0

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d9cce8ba5946620ce030a6b04f58c4011cbd1deb79ee41a6b8999dc6b689604c
size 1928961

3
V4.4.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b32444819bdde13d765d04b5e5392ad960f6609f5e5cc7c9aa5bff36d10a28ad
size 1933037

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Aug 14 08:25:38 UTC 2015 - jengelh@inai.de
- Update to new upstream release 4.4.0
* Changes to the handling of HMAC and Hash contexts to avoild too
many malloc/free calls and thus memory pointer problems.
* Enhance the handling an check the nonce when using multi-stream
mode.
- Drop 0001-pkg-config-add-includedir-libzrtcpp-to-CFLAGS.patch
(merged)
-------------------------------------------------------------------
Tue Mar 17 19:57:23 UTC 2015 - jengelh@inai.de

View File

@ -18,7 +18,7 @@
Name: libzrtpcpp
%define lname libzrtpcpp4
Version: 4.3.1
Version: 4.4.0
Release: 0
Summary: A ccrtp extension for ZRTP support
License: GPL-3.0+
@ -29,7 +29,6 @@ Url: http://www.gnutelephony.org/index.php/GNU_ZRTP
#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: pkg-config
@ -66,8 +65,7 @@ documentation for building applications that use libzrtpcpp.
%prep
%setup -qn ZRTPCPP-%version
%patch -P 1 -p1
chmod a-x NEWS
chmod a-x INSTALL NEWS
%build
mkdir build