zbyszek pushed to libzrtpcpp (master). "Include upstream patch to add -I/usr/include/libzrtpcpp to pkgconfig file"

notifications at fedoraproject.org notifications at fedoraproject.org
Sun Apr 19 15:29:28 UTC 2015


>From bdac4ed84d65cd1610dcfb62202920b47e8afa42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
Date: Sun, 19 Apr 2015 10:03:01 -0400
Subject: Include upstream patch to add -I/usr/include/libzrtpcpp to pkgconfig
 file


diff --git a/libzrtpcpp-pkg-config.patch b/libzrtpcpp-pkg-config.patch
new file mode 100644
index 0000000..93b9990
--- /dev/null
+++ b/libzrtpcpp-pkg-config.patch
@@ -0,0 +1,31 @@
+From f100d9583fb0345ebe91959b9310fed3af1602db Mon Sep 17 00:00:00 2001
+From: Tristan Matthews <tristan.matthews at 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 at zrtplibName@
+-Cflags: -I${includedir}
++Cflags: -I${includedir} -I${includedir}/libzrtpcpp
+ 
+ 
diff --git a/libzrtpcpp.spec b/libzrtpcpp.spec
index fba5617..91036ae 100644
--- a/libzrtpcpp.spec
+++ b/libzrtpcpp.spec
@@ -13,6 +13,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # needs to include. Most modern things treat warnings as errors, causing every
 # dependent build to fail, even if its not even calling zrtp_getSasType
 Patch0:		libzrtpcpp-4.2.4-no-warning.patch
+# https://github.com/tmatth/ZRTPCPP/commit/f100d9583fb0345ebe91959b9310fed3af1602db.patch
+Patch1:         libzrtpcpp-pkg-config.patch
 
 BuildRequires:	ccrtp-devel 
 BuildRequires:	libgcrypt-devel
@@ -82,6 +84,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Sun Apr 19 2015 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 4.2.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Changes/GCC5
+- Include upstream patch to add -I/usr/include/libzrtpcpp to pkgconfig file
 
 * Thu Feb 26 2015 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 4.2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Changes/GCC5
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libzrtpcpp.git/commit/?h=master&id=bdac4ed84d65cd1610dcfb62202920b47e8afa42


More information about the scm-commits mailing list