smani pushed to sflphone (f21). "Install sflphoned in libexecdir (#1219018)"

[notifications at fedoraproject.org]

>From b0179c0658c487bc6ef113b85234c367e32c31f9 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro at gmail.com>
Date: Wed, 6 May 2015 14:47:12 +0200
Subject: Install sflphoned in libexecdir (#1219018)


diff --git a/sflphone.spec b/sflphone.spec
index bf61196..a832210 100644
--- a/sflphone.spec
+++ b/sflphone.spec
@@ -1,6 +1,6 @@
 Name:           sflphone
 Version:        1.4.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        SIP/IAX2 compatible enterprise-class software phone
 
 License:        GPLv3+
@@ -21,6 +21,8 @@ Patch3:         sflphone_zrtp-includes.patch
 Patch4:         sflphone_novideo.patch
 # Fix gcc5 FTBFS issues
 Patch5:         sflphone_gcc5.patch
+# Install sflphoned in libexecdir
+Patch6:         sflphone_sflphoned-dir.patch
 
 # Because of pjproject arm endianness detection issues
 %if 0%{?fedora} < 22
@@ -77,7 +79,7 @@ protocols.
 
 %package common
 Summary:        Common files for SFLPhone
-Requires:       %{name}-libs = %{version}-%{release}
+Requires:       %{name}-daemon = %{version}-%{release}
 BuildArch:      noarch
 
 %description common
@@ -89,26 +91,27 @@ protocols.
 This package includes common files for SFLPhone.
 
 
-%package libs
-Summary:        Daemon libraries for SFLPhone
+%package daemon
+Summary:        SFLPhone daemon
 Requires:       %{name}-common = %{version}-%{release}
 Requires:       dbus%{?_isa}
 %if 0%{?fedora} < 22
 Provides:       bundled(libiax2) = 0.2.3
 %endif
+Obsoletes:      %{name}-libs < 1.4.1-9
 
-%description libs
+%description daemon
 SFLphone is a robust standards-compliant enterprise software phone,
 for desktop and embedded systems. It is designed to handle
 several hundreds of calls a day. It supports both SIP and IAX2
 protocols.
 
-This package includes the SFLPhone daemon libraries.
+This package includes the SFLPhone daemon.
 
 
 %package gnome
 Summary:        SIP/IAX2 compatible enterprise-class software phone
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       %{name}-daemon%{?_isa} = %{version}-%{release}
 Requires:       hicolor-icon-theme
 
 %description gnome
@@ -135,7 +138,7 @@ This package includes the address book plugin.
 
 %package kde
 Summary:        KDE interface for SFLphone
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       %{name}-daemon%{?_isa} = %{version}-%{release}
 Requires:       hicolor-icon-theme
 Requires:       kde-filesystem
 
@@ -171,6 +174,7 @@ This package includes the development files for the KDE client.
 %endif
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # Unbundle bundled libraries
 %if 0%{?fedora} >= 22
@@ -272,11 +276,12 @@ fi
 %doc daemon/AUTHORS NEWS README
 %{_datadir}/%{name}/
 
-%files libs
+%files daemon
 %{_libdir}/%{name}/
 %{_datadir}/dbus-1/services/org.%{name}.SFLphone.service
 %exclude %{_libdir}/%{name}/plugins/
 %{_mandir}/man1/sflphoned.1.gz*
+%{_libexecdir}/sflphoned
 
 %files gnome -f sflphone.lang
 %{_bindir}/sflphone
@@ -308,6 +313,10 @@ fi
 
 
 %changelog
+* Wed May 06 2015 Sandro Mani <manisandro at gmail.com> - 1.4.1-9
+- Install sflphoned in /usr/libexec
+- Rename sflphone-libs -> sflphone-daemon
+
 * Tue Apr 28 2015 Milan Crha <mcrha at redhat.com> - 1.4.1-8
 - Rebuild for newer evolution-data-server
 
diff --git a/sflphone_macro-collision.patch b/sflphone_macro-collision.patch
deleted file mode 100644
index 7b7f513..0000000
--- a/sflphone_macro-collision.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rupN sflphone-1.4.1/daemon/src/ip_utils.h sflphone-1.4.1-new/daemon/src/ip_utils.h
---- sflphone-1.4.1/daemon/src/ip_utils.h	2014-09-19 18:09:33.000000000 +0200
-+++ sflphone-1.4.1-new/daemon/src/ip_utils.h	2015-02-21 23:27:06.631839605 +0100
-@@ -33,6 +33,7 @@
- #define IP_UTILS_H_
- 
- #include <pjlib.h>
-+#undef isblank // macro collides with symbol...
- #include <ccrtp/channel.h> // For ost::IPV*Address
- 
- #include <netinet/ip.h>
diff --git a/sflphone_sflphoned-dir.patch b/sflphone_sflphoned-dir.patch
new file mode 100644
index 0000000..ec266bf
--- /dev/null
+++ b/sflphone_sflphoned-dir.patch
@@ -0,0 +1,22 @@
+diff -rupN sflphone-1.4.1/daemon/src/client/dbus/Makefile.am sflphone-1.4.1-new/daemon/src/client/dbus/Makefile.am
+--- sflphone-1.4.1/daemon/src/client/dbus/Makefile.am	2014-09-19 18:09:33.000000000 +0200
++++ sflphone-1.4.1-new/daemon/src/client/dbus/Makefile.am	2015-05-06 14:35:15.551521795 +0200
+@@ -70,7 +70,7 @@ service_DATA = $(service_in_files:.servi
+ 
+ # Rule to make the service file with bindir expanded
+ $(service_DATA): $(service_in_files) Makefile
+-	sed -e "s|libexec|$(libdir)/sflphone|" $<> $@
++	sed -e "s|libexec|$(libexecdir)|" $<> $@
+ 
+ EXTRA_DIST = README $(service_in_files) \
+ 			 callmanager-introspec.xml \
+diff -rupN sflphone-1.4.1/daemon/src/Makefile.am sflphone-1.4.1-new/daemon/src/Makefile.am
+--- sflphone-1.4.1/daemon/src/Makefile.am	2014-09-19 18:09:33.000000000 +0200
++++ sflphone-1.4.1-new/daemon/src/Makefile.am	2015-05-06 14:31:46.556525919 +0200
+@@ -1,6 +1,5 @@
+ include ../globals.mak
+ 
+-libexecdir=$(libdir)/sflphone
+ libexec_PROGRAMS = sflphoned
+ 
+ if SFL_VIDEO
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/sflphone.git/commit/?h=f21&id=b0179c0658c487bc6ef113b85234c367e32c31f9