[sflphone] LDFLAGS fix, adapt spec for F20, F21

[Sandro Mani]

commit 7ba2ad29c894bf635ce64756872ba362687e2161
Author: Sandro Mani <manisandro at gmail.com>
Date:   Mon Jan 26 11:38:10 2015 +0100

    LDFLAGS fix, adapt spec for F20, F21

 sflphone.spec |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)
---
diff --git a/sflphone.spec b/sflphone.spec
index 91687be..3e84660 100644
--- a/sflphone.spec
+++ b/sflphone.spec
@@ -9,12 +9,14 @@ URL:            http://sflphone.org/
 Source0:        https://projects.savoirfairelinux.com/attachments/download/14805/%{name}-%{version}.tar.gz
 # Install icon to hicolor/scalable/apps
 Patch0:         sflphone_icondir.patch
-# Unbundle libraries
+# Unbundle pjproject
 Patch1:         sflphone_unbundle.patch
+%if 0%{?fedora} >= 22
 # ZRTP API changes
 Patch2:         sflphone_zrtp.patch
 # Workaround for bad #includes in zrtp headers, see https://github.com/wernerd/ZRTPCPP/pull/19
 Patch3:         sflphone_zrtp-includes.patch
+%endif
 # Disable video support in kde interface (video is not available without ffmpeg)
 Patch4:         sflphone_novideo.patch
 
@@ -32,7 +34,9 @@ BuildRequires:  gnome-common
 BuildRequires:  gnome-doc-utils
 BuildRequires:  gnutls-devel
 BuildRequires:  gsm-devel
+%if 0%{?fedora} >= 22
 BuildRequires:  iaxclient-libiax-devel
+%endif
 BuildRequires:  ilbc-devel
 BuildRequires:  intltool
 BuildRequires:  kdepimlibs-devel
@@ -82,6 +86,9 @@ This package includes common files for SFLPhone.
 %package libs
 Summary:        Daemon libraries for SFLPhone
 Requires:       %{name}-common = %{version}-%{release}
+%if 0%{?fedora} < 22
+Provides:       bundled(libiax2) = 0.2.3
+%endif
 
 %description libs
 SFLphone is a robust standards-compliant enterprise software phone,
@@ -151,12 +158,18 @@ This package includes the development files for the KDE client.
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%if 0%{?fedora} >= 22
 %patch2 -p1
 %patch3 -p1
+%endif
 %patch4 -p1
 
-# Unbundle
-rm -rf daemon/libs/
+# Unbundle bundled libraries
+%if 0%{?fedora} >= 22
+rm -rf daemon/libs
+%else
+rm -rf daemon/libs/pjproject-2.2.1
+%endif
 
 # Fix FSF addresses
 find . -type f -print0 | xargs -0 sed -i 's|675 Mass Ave, Cambridge, MA 02139|51 Franklin Street, Fifth Floor, Boston, MA  02110-1301|'
@@ -166,7 +179,7 @@ find . -type f -print0 | xargs -0 sed -i 's|675 Mass Ave, Cambridge, MA 02139|51
 ### Compile the daemon ###
 pushd daemon
 ./autogen.sh
-LDFLAGS="-Wl,--as-needed" %configure --disable-video
+LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %configure --disable-video
 make %{?_smp_mflags} V=1
 make doc
 popd
@@ -174,21 +187,21 @@ popd
 ### Compile gnome client ###
 pushd gnome
 ./autogen.sh
-LDFLAGS="-Wl,--as-needed" %configure
+LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %configure
 make %{?_smp_mflags} V=1
 popd
 
 ### Compile plugins ###
 pushd plugins
 ./autogen.sh
-LDFLAGS="-Wl,--as-needed" %configure
+LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %configure
 make %{?_smp_mflags} V=1
 popd
 
 ### Compile kde client ###
 mkdir kde/build
 pushd kde/build
-LDFLAGS="-Wl,--as-needed" %cmake ..
+LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %cmake ..
 make %{?_smp_mflags} VERBOSE=1
 popd
 
@@ -287,6 +300,9 @@ fi
 
 
 %changelog
+* Mon Jan 26 2015 Sandro Mani <manisandro at gmail.com> - 1.4.1-3
+- Set %%{__global_ldflags} in LDFLAGS override
+
 * Thu Jan 22 2015 Sandro Mani <manisandro at gmail.com> - 1.4.1-2
 - Use %%license
 - Add Requires: dbus to sflphone-common