diff --git a/daemon/contrib/.gitignore b/daemon/contrib/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..6ee52f7fd68f3c4dc1dfa120a46e3896bbea1199 --- /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 1b0d79f3774548a2af6d6b27ab3477e085263524..83b472dcedec6bbe6ebf59f58ce98697d22c3029 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