1
0
forked from pool/libzrtpcpp

Accepting request 258379 from network:telephony

copy to 13.2
- Add 0001-pkg-config-add-includedir-libzrtcpp-to-CFLAGS.patch
  to fix downstream compilation [bso#902614]

OBS-URL: https://build.opensuse.org/request/show/258379
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzrtpcpp?expand=0&rev=31
This commit is contained in:
Stephan Kulow 2014-10-29 20:09:39 +00:00 committed by Git OBS Bridge
commit b56a5ef02c
3 changed files with 43 additions and 0 deletions

View File

@ -0,0 +1,35 @@
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 +1,9 @@
-------------------------------------------------------------------
Sat Oct 25 12:46:04 UTC 2014 - jengelh@inai.de
- Add 0001-pkg-config-add-includedir-libzrtcpp-to-CFLAGS.patch
to fix downstream compilation [bso#902614]
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 13 09:26:17 UTC 2014 - jengelh@inai.de Mon Oct 13 09:26:17 UTC 2014 - jengelh@inai.de

View File

@ -30,6 +30,7 @@ Url: http://www.gnutelephony.org/index.php/GNU_ZRTP
# No longer produces release tarballs since 3.x. # No longer produces release tarballs since 3.x.
Source: %name-%version.tar.xz Source: %name-%version.tar.xz
Source2: %name.keyring Source2: %name.keyring
Patch1: 0001-pkg-config-add-includedir-libzrtcpp-to-CFLAGS.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ >= 4.7 BuildRequires: gcc-c++ >= 4.7
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -67,6 +68,7 @@ documentation for building applications that use libzrtpcpp.
%prep %prep
%setup -qn ZRTPCPP %setup -qn ZRTPCPP
%patch -P 1 -p1
%build %build
mkdir build mkdir build