diff --git a/0001-pkg-config-add-includedir-libzrtcpp-to-CFLAGS.patch b/0001-pkg-config-add-includedir-libzrtcpp-to-CFLAGS.patch new file mode 100644 index 0000000..cb285a2 --- /dev/null +++ b/0001-pkg-config-add-includedir-libzrtcpp-to-CFLAGS.patch @@ -0,0 +1,35 @@ +From f100d9583fb0345ebe91959b9310fed3af1602db Mon Sep 17 00:00:00 2001 +X-Git-Clone: git://github.com/tmatth/ZRTPCPP +From: Tristan Matthews +Date: Mon, 14 Jul 2014 11:31:17 -0400 +Subject: [PATCH] pkg-config: add /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 + diff --git a/libzrtpcpp.changes b/libzrtpcpp.changes index d0daa1b..2fe4471 100644 --- a/libzrtpcpp.changes +++ b/libzrtpcpp.changes @@ -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 diff --git a/libzrtpcpp.spec b/libzrtpcpp.spec index b668931..50e6ef0 100644 --- a/libzrtpcpp.spec +++ b/libzrtpcpp.spec @@ -30,6 +30,7 @@ Url: http://www.gnutelephony.org/index.php/GNU_ZRTP # No longer produces release tarballs since 3.x. Source: %name-%version.tar.xz Source2: %name.keyring +Patch1: 0001-pkg-config-add-includedir-libzrtcpp-to-CFLAGS.patch BuildRequires: cmake BuildRequires: gcc-c++ >= 4.7 BuildRequires: pkgconfig @@ -67,6 +68,7 @@ documentation for building applications that use libzrtpcpp. %prep %setup -qn ZRTPCPP +%patch -P 1 -p1 %build mkdir build