From 7996dda1b01639aa5ad7d0ff1dde3b8ae662bb94 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Mon, 25 Aug 2014 14:59:28 -0400
Subject: [PATCH] rpm: build iax and pjproject with contrib
They are not packaged for Fedora (yet).
Refs #53224
Change-Id: I6b28accee7a50565d4b7fe731ae820e3d151571b
---
daemon/contrib/.gitignore | 3 +++
tools/build-system/rpm/sflphone.spec | 13 +++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
create mode 100644 daemon/contrib/.gitignore
diff --git a/daemon/contrib/.gitignore b/daemon/contrib/.gitignore
new file mode 100644
index 0000000000..6ee52f7fd6
--- /dev/null
+++ b/daemon/contrib/.gitignore
@@ -0,0 +1,3 @@
+# Ignore contrib-generated files and directories
+native
+x86_64-*
diff --git a/tools/build-system/rpm/sflphone.spec b/tools/build-system/rpm/sflphone.spec
index 1b0d79f377..83b472dced 100644
--- a/tools/build-system/rpm/sflphone.spec
+++ b/tools/build-system/rpm/sflphone.spec
@@ -42,13 +42,11 @@ protocols.
%setup -q -n %{tarball}
%build
-# Compile the dependencies
-pushd contrib
-mkdir -p native
-pushd native
+# Build some dependencies with contrib since no Fedora packages exist (yet)
+mkdir -p daemon/contrib/native
+pushd daemon/contrib/native
../bootstrap
-make
-popd
+make .iax .pjproject
popd
# Compile the daemon
pushd daemon
@@ -275,6 +273,9 @@ fi
%exclude %{_includedir}/qtsflphone/*.h
%changelog
+* Mon Aug 25 2014 Tristan Matthews <tristan.matthews@savoirfairelinux.com> - 1.4.1-3
+- Build iax and pjproject with contrib
+
* Wed Jul 23 2014 Simon Piette <simon.piette@savoirfairelinux.com> - 1.4.1-2
- Always build kde package
--
GitLab