Merge branch 'master' into f23

kde-connect.spec

@@ -6,7 +6,7 @@
 
 Name:           kde-connect
 Version:        0.8
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        GPLv2+
 Summary:        KDE Connect client for communication with smartphones
 
@@ -21,11 +21,15 @@ Source0:        kdeconnect-kde-%{_git_describe}.tar.xz
 %endif
 Source1:        http://download.kde.org/unstable/kdeconnect/%{version}/src/kdeconnect-kde-%{version}.tar.xz
 
+# firewalld service definition, see https://bugzilla.redhat.com/show_bug.cgi?id=1257699#c2
+Source2:        kde-connect.xml
+
 # Upstream patch for KDE 4 version
 Patch0:         kdeconnect-kde-0.8-b-revision.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  extra-cmake-modules
+BuildRequires:  firewalld-filesystem
 BuildRequires:  kf5-rpm-macros
 BuildRequires:  kf5-kcmutils-devel
 BuildRequires:  kf5-kconfigwidgets-devel
@@ -50,6 +54,7 @@ BuildRequires:  pkgconfig(qca2)
 %endif
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       firewalld-filesystem
 Requires:       kf5-filesystem
 Requires:       fuse-sshfs
 Requires:       qca-qt5-ossl
@@ -118,6 +123,8 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+install -m644 -p -D %{SOURCE10} %{buildroot}%{_prefix}/lib/firewalld/services/kde-connect.xml
+
 %find_lang %{name} --all-name
 
 %if %{_with_kde4}
@@ -138,6 +145,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/kdeconnect.desktop
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+%{?firewalld_reload}
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
@@ -166,6 +174,7 @@ fi
 %{_qt5_prefix}/plugins/kdeconnect*.so
 %{_qt5_prefix}/plugins/kdeconnect/
 %{_sysconfdir}/xdg/autostart/kdeconnectd.desktop
+%{_prefix}/lib/firewalld/services/kde-connect.xml
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
@@ -189,6 +198,9 @@ fi
 
 
 %changelog
+* Wed Sep 23 2015 Rex Dieter <rdieter@fedoraproject.org> 0.8-9
+- include kde-connect firewalld service (#1115547)
+
 * Thu Aug 27 2015 Helio Chissini de Castro <helio@kde.org> - 0.8-8
 - Added buildreq for specific qca version that has proper headers
 

kde-connect.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service>
+  <short>KDE Connect</short>
+  <description>KDE Connect allows intercommunicating with mobile devices to receive messages and notifications.</description>
+  <port protocol="tcp" port="1714-1764"/>
+  <port protocol="udp" port="1714-1764"/>
+</service>