diff --git a/.gitignore b/.gitignore index 4fdbfd1..dc19fe4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ /kdeconnect-kde-0.8.tar.xz -/kdeconnect-kde-v0.8-231-gfdf91aa.tar.xz -/kdeconnect-kde-v0.8-329-g43161b3.tar.xz -/kdeconnect-kde-v0.8-339-g2b34d28.tar.xz +/kdeconnect-kde-0.9f.tar.xz diff --git a/kde-connect.spec b/kde-connect.spec index 05f6887..25c2a8d 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -1,25 +1,27 @@ # once kf5 dolphin lands, may consider disabling this -- rex +#if 0%{?fedora} < 23 %global _with_kde4 1 +#endif # After tag v0.8 with Frameworks -%define _git_describe v0.8-339-g2b34d28 +#define _git_describe v0.8-339-g2b34d28 Name: kde-connect -Version: 0.8 -Release: 9%{?dist} +Version: 0.9 +Release: 2%{?dist} License: GPLv2+ Summary: KDE Connect client for communication with smartphones -Url: https://projects.kde.org/projects/playground/base/kdeconnect-kde +Url: https://projects.kde.org/kdeconnect-kde %if 0%{?_git_describe:1} # using releaseme: # ./tarme.rb kdeconnect-kde --origin trunk --version 0.8 # then rename accordingly Source0: kdeconnect-kde-%{_git_describe}.tar.xz %else -# no kf5 release yet +Source0: http://download.kde.org/unstable/kdeconnect/%{version}/src/kdeconnect-kde-%{version}f.tar.xz %endif -Source1: http://download.kde.org/unstable/kdeconnect/%{version}/src/kdeconnect-kde-%{version}.tar.xz +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 @@ -27,6 +29,7 @@ Source2: kde-connect.xml # Upstream patch for KDE 4 version Patch0: kdeconnect-kde-0.8-b-revision.patch +BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules BuildRequires: firewalld-filesystem @@ -51,6 +54,9 @@ BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(libfakekey) BuildRequires: pkgconfig(QJson) BuildRequires: pkgconfig(qca2) +%else +Obsoletes: kde-connect-kde4-ioslave < 0.9 +Obsoletes: kde-connect-kde4-libs < 0.9 %endif Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -58,6 +64,10 @@ Requires: firewalld-filesystem Requires: kf5-filesystem Requires: fuse-sshfs Requires: qca-qt5-ossl +# /usr/bin/plasmawindowed +Requires: plasma-workspace +# /usr/bin/kcmshell5 +Requires: kde-cli-tools %description KDE Connect adds communication between KDE and your smartphone. @@ -72,6 +82,13 @@ Requires: %{name} = %{version}-%{release} %description libs %{summary}. +%package devel +Summary: Development files for %{name} +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 @@ -85,12 +102,7 @@ Requires: %{name}-kde4-libs%{?_isa} = %{version}-%{release} Requires: fuse-sshfs %description kde4-ioslave %{summary}. - -%package devel -Summary: Development files for %{name} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%description devel -%{summary}. +%endif %prep @@ -105,18 +117,19 @@ popd make %{?_smp_mflags} -C %{_target_platform} -%if %{_with_kde4} +%if 0%{?_with_kde4} mkdir -p %{_builddir}/kde4 cd %{_builddir}/kde4 tar xfJ %{SOURCE1} -cd kdeconnect-kde-%{version} +cd kdeconnect-kde-0.8 patch -p1 < %{PATCH0} mkdir -p %{_target_platform} pushd %{_target_platform} - %{cmake_kde4} .. -popd +%{cmake_kde4} .. -make %{?_smp_mflags} -C %{_target_platform} +make %{?_smp_mflags} -C interfaces/ +make %{?_smp_mflags} -C kio/ +popd %endif @@ -128,19 +141,19 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_prefix}/lib/firewalld/services/kde %find_lang %{name} --all-name %if %{_with_kde4} -make install/fast DESTDIR=%{buildroot} -C %{_builddir}/kde4/kdeconnect-kde-%{version}/%{_target_platform}/kio -make install/fast DESTDIR=%{buildroot} -C %{_builddir}/kde4/kdeconnect-kde-%{version}/%{_target_platform}/interfaces +make install/fast DESTDIR=%{buildroot} -C %{_builddir}/kde4/kdeconnect-kde-0.8/%{_target_platform}/interfaces +make install/fast DESTDIR=%{buildroot} -C %{_builddir}/kde4/kdeconnect-kde-0.8/%{_target_platform}/kio # Remove undesired kde4 devel files -rm -rf %{buildroot}%{_includedir}/kde4/ -rm -rf %{buildroot}%{_libdir}/cmake/ -rm -rf %{buildroot}%{_kde4_libdir}/libkdeconnectinterfaces.so +rm -rfv %{buildroot}%{_includedir}/kde4/ +rm -rfv %{buildroot}%{_libdir}/cmake/ +rm -rfv %{buildroot}%{_kde4_libdir}/libkdeconnectinterfaces.so %endif %check -desktop-file-validate %{buildroot}%{_datadir}/applications/kdeconnect-non-plasma.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/kdeconnect.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kdeconnect.kcm.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kdeconnect.nonplasma.desktop %post @@ -152,12 +165,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : %postun if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : - gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : +touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : +gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : +%{?firewalld_reload} fi %files -f %{name}.lang -%doc COPYING +%license COPYING %{_libexecdir}/kdeconnectd %{_kf5_bindir}/kdeconnect-cli %{_kf5_datadir}/plasma/plasmoids/org.kde.kdeconnect/ @@ -167,7 +181,8 @@ fi %{_kf5_datadir}/kservicetypes5/*.desktop %{_datadir}/dbus-1/services/*.service %{_datadir}/icons/hicolor/*/*/* -%{_datadir}/applications/*.desktop +%{_datadir}/applications/org.kde.kdeconnect.kcm.desktop +%{_datadir}/applications/org.kde.kdeconnect.nonplasma.desktop %{_qt5_prefix}/qml/org/kde/kdeconnect/ %{_qt5_prefix}/plugins/kcm_kdeconnect.so %{_qt5_prefix}/plugins/kio_kdeconnect.so @@ -184,7 +199,7 @@ fi %{_kf5_libdir}/libkdeconnectinterfaces.so.0* %{_kf5_libdir}/libkdeconnectcore.so.0* -%if %{_with_kde4} +%if 0%{?_with_kde4} %post kde4-libs -p /sbin/ldconfig %postun kde4-libs -p /sbin/ldconfig @@ -198,6 +213,15 @@ fi %changelog +* Thu Nov 19 2015 Rex Dieter 0.9-2 +- respin kde-connect-0.9f, includes translations + +* Mon Nov 16 2015 Rex Dieter 0.9-1 +- kde-connect-0.9 (missing translations?) + +* Tue Nov 10 2015 Rex Dieter 0.8-10 +- Requires: plasma-workspace kde-cli-tools (#1280078) + * Wed Sep 23 2015 Rex Dieter 0.8-9 - include kde-connect firewalld service (#1115547) diff --git a/sources b/sources index 2eca51d..3690ff1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 43fbad180dc5412c8c0131399acaceea kdeconnect-kde-0.8.tar.xz -87af553e44cdaba02f4b14ba6e73ab41 kdeconnect-kde-v0.8-339-g2b34d28.tar.xz +8574467d0d905a7267f79ffc80ca0934 kdeconnect-kde-0.9f.tar.xz