From 5d306e9e929b1d214b02ff3eb9c6d44bad8730bf Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Tue, 4 Nov 2014 02:49:48 -0500
Subject: [PATCH] rpm: use pjproject from the distro
Refs #59604
Change-Id: Ide0d16eca3637a5cce78f55dc40647afbbcf34ef
---
tools/build-system/rpm/sflphone.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tools/build-system/rpm/sflphone.spec b/tools/build-system/rpm/sflphone.spec
index a7252380bb..c43fc34c9a 100644
--- a/tools/build-system/rpm/sflphone.spec
+++ b/tools/build-system/rpm/sflphone.spec
@@ -22,6 +22,7 @@ BuildRequires: gsm-devel opus-devel speex-devel expat-devel libsamplerate-d
BuildRequires: gnome-doc-utils libtool libsexy-devel intltool yelp-tools
BuildRequires: libnotify-devel check-devel rarian-compat ilbc-devel
BuildRequires: evolution-data-server-devel gnome-common libsndfile-devel
+BuildRequires: pjproject-devel
# KDE requires
BuildRequires: cmake kdepimlibs-devel
BuildRequires: perl-podlators
@@ -46,7 +47,7 @@ protocols.
mkdir -p daemon/contrib/native
pushd daemon/contrib/native
../bootstrap
-make .iax .pjproject
+make .iax
popd
# Compile the daemon
pushd daemon
@@ -278,9 +279,12 @@ fi
%exclude %{_includedir}/qtsflphone/*.h
%changelog
-* Fri Nov 14 2014 Simon Piette <simon.piette@savoirfairelinux.com> - 1.4.2-2
+* Fri Nov 14 2014 Simon Piette <simon.piette@savoirfairelinux.com> - 1.4.2-3
- Changed sflphoned path
+* Tue Nov 4 2014 Tristan Matthews <tristan.matthews@savoirfairelinux.com> - 1.4.2-2
+- Use Fedora's pjproject package
+
* Thu Sep 25 2014 Tristan Matthews <tristan.matthews@savoirfairelinux.com> - 1.4.2-1
- Bump version after release
--
GitLab