Accepting request 720797 from KDE:Extra

OBS-URL: https://build.opensuse.org/request/show/720797
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdeconnect-kde?expand=0&rev=16

kdeconnect-kde.spec

@@ -17,7 +17,7 @@
 
 
 Name:           kdeconnect-kde
-Version:        1.3.4
+Version:        1.3.5
 Release:        0
 Summary:        Integration of Android with Linux desktops
 License:        GPL-2.0-or-later
@@ -27,10 +27,6 @@ Source:         https://download.kde.org/stable/kdeconnect/%{version}/%{name}-%{
 Source1:        https://download.kde.org/stable/kdeconnect/%{version}/%{name}-%{version}.tar.xz.sig
 Source100:      kdeconnect-kde.SuSEfirewall
 Source101:      kdeconnect-kde-firewalld.xml
-# PATCH-FIX-OPENSUSE
-Patch0:         0001-Fix-build-on-Leap-42.3.patch
-# PATCH-FIX-OPENSUSE
-Patch1:         0001-Revert-Retry-the-network-packet-if-it-failed-to-unse.patch
 BuildRequires:  cmake >= 3.0
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-filesystem
@@ -75,10 +71,6 @@ https://f-droid.org/en/packages/org.kde.kdeconnect_tp/
 
 %prep
 %setup -q
-%if 0%{?suse_version} < 1500
-%patch0 -p1
-%patch1 -p1
-%endif
 
 %build
 %cmake_kf5 -d build
@@ -87,13 +79,16 @@ https://f-droid.org/en/packages/org.kde.kdeconnect_tp/
 %install
 %kf5_makeinstall -C build
 
-for translation_file in kdeconnect-{cli,core,kcm,kded,kio,plugins,urlhandler} plasma_applet_org.kde.kdeconnect; do
+for translation_file in kdeconnect-{cli,core,fileitemaction,kcm,kded,kio,nautilus-extension,plugins,urlhandler} plasma_applet_org.kde.kdeconnect; do
     %find_lang $translation_file %{name}.lang
 done
 
+%if %{suse_version} < 1550
 # susefirewall config file
 install -D -m 0644 %{SOURCE100} \
     %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
+%endif
+# firewalld config file
 install -D -m 0644 %{SOURCE101} \
     %{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml
 
@@ -105,7 +100,9 @@ install -D -m 0644 %{SOURCE101} \
 %files
 %license COPYING
 %doc README*
+%if %{suse_version} < 1550
 %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
+%endif
 %dir %{_datadir}/nautilus-python
 %dir %{_libexecdir}/firewalld
 %dir %{_libexecdir}/firewalld/services
@@ -127,7 +124,7 @@ install -D -m 0644 %{SOURCE101} \
 %{_kf5_bindir}/kdeconnect-handler
 %{_kf5_bindir}/kdeconnect-indicator
 %{_kf5_sharedir}/dbus-1/services/org.kde.kdeconnect.service
-%{_kf5_configdir}/autostart/kdeconnectd.desktop
+%{_kf5_configdir}/autostart/org.kde.kdeconnect.daemon.desktop
 %{_kf5_iconsdir}/hicolor/*/status/*
 %{_kf5_htmldir}/en/kdeconnect/
 %dir %{_kf5_appstreamdir}