kdeconnect-1.0.3 (#1408570), drop kde4 (compat) kioslave

.gitignore

@@ -1,2 +1 @@
-/kdeconnect-kde-0.8.tar.xz
-/kdeconnect-kde-1.0.1.tar.xz
+/kdeconnect-kde-1.0.3.tar.xz

kde-connect.spec

@@ -1,11 +1,7 @@
-# once kf5 dolphin lands, may consider disabling this -- rex
-%if 0%{?fedora} < 24
-%global _with_kde4 1
-%endif
 
 Name:           kde-connect
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.3
+Release:        1%{?dist}
 License:        GPLv2+
 Summary:        KDE Connect client for communication with smartphones
 
@@ -18,16 +14,10 @@ Source0:        kdeconnect-kde-%{_git_describe}.tar.xz
 %else
 Source0:        http://download.kde.org/stable/kdeconnect/%{version}/src/kdeconnect-kde-%{version}.tar.xz
 %endif
-Source1:        http://download.kde.org/unstable/kdeconnect/0.8/src/kdeconnect-kde-0.8.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
-# artificially inflate kde4 lib soname +99 to avoid risk of collison with kf5 lib of same basename
-Patch1:         kdeconnect-kde-0.8-soname.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  extra-cmake-modules
 BuildRequires:  firewalld-filesystem
@@ -48,16 +38,8 @@ BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qtdeclarative-devel
 BUildRequires:  qt5-qtx11extras-devel
 
-%if 0%{?_with_kde4}
-BuildRequires:  kdelibs4-devel
-BuildRequires:  pkgconfig(dbus-1)
-BuildRequires:  pkgconfig(libfakekey)
-BuildRequires:  pkgconfig(QJson)
-BuildRequires:  pkgconfig(qca2)
-%else
 Obsoletes: kde-connect-kde4-ioslave < %{version}-%{release}
 Obsoletes: kde-connect-kde4-libs < %{verson}-%{release}
-%endif
 
 # upstream name
 Provides:       kdeconnect-kde = %{version}-%{release}
@@ -99,35 +81,10 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %description devel
 %{summary}.
 
-%if 0%{?_with_kde4}
-%package kde4-libs
-Summary: Runtime libraries for %{name} KDE4 kioslave
-# circular deps, this is mostly useless without the ioslave too -- rex
-Requires: %{name}-kde4-ioslave = %{version}-%{release}
-%description kde4-libs
-%{summary}.
-
-%package kde4-ioslave
-Summary: %{name} KDE4 kioslave
-Requires: %{name}-kde4-libs%{?_isa} = %{version}-%{release}
-Requires: fuse-sshfs
-%description kde4-ioslave
-%{summary}.
-%endif
-
 
 %prep
 %setup -q -n kdeconnect-kde-%{version}
 
-%if 0%{?_with_kde4}
-tar xfJ %{SOURCE1}
-pushd kdeconnect-kde-0.8
-%patch0 -p1
-%patch1 -p1 -b .soname
-popd
-%endif
-
-
 
 %build
 mkdir %{_target_platform}
@@ -137,31 +94,8 @@ popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
-%if 0%{?_with_kde4}
-pushd kdeconnect-kde-0.8
-mkdir %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kde4} ..
-
-make %{?_smp_mflags} -C interfaces/
-make %{?_smp_mflags} -C kio/
-popd
-popd
-%endif
-
 
 %install
-# install kde4 bits first to reduce risk of polluting or overwriting kf5 stuff
-%if 0%{?_with_kde4}
-make install/fast DESTDIR=%{buildroot} -C kdeconnect-kde-0.8/%{_target_platform}/interfaces
-make install/fast DESTDIR=%{buildroot} -C kdeconnect-kde-0.8/%{_target_platform}/kio
-
-# Remove undesired kde4 devel files
-rm -rfv %{buildroot}%{_includedir}/kde4/
-rm -rfv %{buildroot}%{_libdir}/cmake/
-rm -rfv %{buildroot}%{_kde4_libdir}/libkdeconnectinterfaces.so
-%endif
-
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 install -m644 -p -D %{SOURCE2} %{buildroot}%{_prefix}/lib/firewalld/services/kde-connect.xml
@@ -231,20 +165,11 @@ fi
 %{_qt5_plugindir}/kdeconnect*.so
 %{_qt5_plugindir}/kdeconnect/
 
-%if 0%{?_with_kde4}
-%post kde4-libs -p /sbin/ldconfig
-%postun kde4-libs -p /sbin/ldconfig
-
-%files kde4-libs
-%{_kde4_libdir}/libkdeconnectinterfaces.so.100*
-
-%files kde4-ioslave
-%{_kde4_datadir}/kde4/services/kdeconnect.protocol
-%{_kde4_libdir}/kde4/kio_kdeconnect.so
-%endif
-
 
 %changelog
+* Tue Dec 27 2016 Rex Dieter <rdieter@math.unl.edu> - 1.0.3-1
+- kdeconnect-1.0.3 (#1408570), drop kde4 (compat) kioslave 
+
 * Wed Oct 05 2016 Rex Dieter <rdieter@fedoraproject.org> - 1.0.1-2
 - fix _with_kde4 conditional
 

kdeconnect-kde-0.8-soname.patch

@@ -1,9 +0,0 @@
-diff -up kdeconnect-kde-0.8/interfaces/CMakeLists.txt.soname kdeconnect-kde-0.8/interfaces/CMakeLists.txt
---- kdeconnect-kde-0.8/interfaces/CMakeLists.txt.soname	2015-01-31 22:01:24.000000000 -0600
-+++ kdeconnect-kde-0.8/interfaces/CMakeLists.txt	2016-10-05 08:12:38.996479517 -0500
-@@ -1,4 +1,4 @@
--set(KDECONNECT_VERSION_MAJOR 1)
-+set(KDECONNECT_VERSION_MAJOR 100)
- set(KDECONNECT_VERSION_MINOR 0)
- set(KDECONNECT_VERSION_PATCH 1)
- set(KDECONNECT_VERSION "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}.${KDECONNECT_VERSION_PATCH}")

sources

@@ -1,2 +1 @@
-43fbad180dc5412c8c0131399acaceea  kdeconnect-kde-0.8.tar.xz
-9f2af720aae76bb8a32f29c0fcee0ac7  kdeconnect-kde-1.0.1.tar.xz
+SHA512 (kdeconnect-kde-1.0.3.tar.xz) = b24acd75c05aab4638aa16ff7314dd68634fab4f9708124e8947960c92a6a4cfe66d47dd3575f89822771267319bfce124fcee752ea65951b49b55f8aa026937