diff --git a/.gitignore b/.gitignore index f35fd21..c841ca4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/kdeconnect-kde-0.4.2.tar.xz -/kdeconnect-kde-0.5.tar.xz -/kdeconnect-kde-0.6.tar.xz +/kdeconnect-kde-0.7.tar.xz diff --git a/kde-connect.spec b/kde-connect.spec index a817cd4..5c08894 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -1,6 +1,6 @@ Name: kde-connect -Version: 0.6 -Release: 0.3.20140305git52901898%{?dist} +Version: 0.7 +Release: 1%{?dist} License: GPLv2+ Summary: KDE Connect client for communication with smartphones @@ -12,7 +12,11 @@ BuildRequires: kdelibs4-devel BuildRequires: qjson-devel BuildRequires: qca2-devel +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: fuse-sshfs Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} +# core/daemon.cpp comments hint qca-gnupg may be required too (but I doubt it) -- rex +Requires: qca-ossl%{?_isa} %description KDE Connect adds communication between KDE and your smartphone. @@ -21,6 +25,20 @@ Currently, you can pair with your Android devices over Wifi using the KDE Connect app from Albert Vaka which you can obtain via Google Play, F-Droid or the project website. +%package libs +Summary: Runtime libraries for %{name} +# when -libs was introduced, upgrade path for multilib'd kde-connect +Obsoletes: kde-connect < 0.7-1 +Requires: %{name} = %{version}-%{release} +%description libs +%{summary}. + +%package devel +Summary: Development files for %{name} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +%description devel +%{summary}. + %prep %setup -q -n kdeconnect-kde-%{version} @@ -38,27 +56,25 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %post -/sbin/ldconfig -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +/bin/touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || : %postun -/sbin/ldconfig ||: if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + /bin/touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || : fi %posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - +/usr/bin/gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || : %files -f %{name}.lang %doc COPYING README +%{_kde4_bindir}/kdeconnect-cli #daemon %{_libexecdir}/kde4/kdeconnectd #kcm %{_kde4_libdir}/kde4/kcm_kdeconnect.so -%{_datadir}/applications/kde4/kdeconnect.desktop +%{_kde4_datadir}/applications/kde4/kdeconnect.desktop %{_kde4_datadir}/kde4/services/kcm_kdeconnect.desktop #kio %{_kde4_libdir}/kde4/kio_kdeconnect.so @@ -66,9 +82,7 @@ fi #lib %{_kde4_libdir}/kde4/imports/org/kde/kdeconnect/ %{_kde4_libdir}/kde4/kded_kdeconnect.so -%{_kde4_libdir}/libkdeconnect.so -%{_kde4_libdir}/libkdeconnect.so.1 -%{_kde4_libdir}/libkdeconnect.so.1.0.1 +%{_kde4_libdir}/libkdeconnectcore.so #dbus interfaces %{_datadir}/dbus-1/interfaces/org.kde.kdeconnect.daemon.xml %{_datadir}/dbus-1/interfaces/org.kde.kdeconnect.device.battery.xml @@ -76,21 +90,38 @@ fi %{_datadir}/dbus-1/interfaces/org.kde.kdeconnect.device.notifications.xml %{_datadir}/dbus-1/interfaces/org.kde.kdeconnect.device.xml %{_datadir}/dbus-1/interfaces/org.kde.kdeconnect.device.sftp.xml -%{_datadir}/dbus-1/interfaces/org.kde.kded.kdeconnect.xml #modules -%{_kde4_libdir}/kde4/kdeconnect_*.so +%{_kde4_libdir}/kde4/kdeconnect*.so %{_kde4_appsdir}/kdeconnect/ %{_kde4_appsdir}/plasma/plasmoids/kdeconnect/ #module desktop files -%{_kde4_datadir}/kde4/services/kdeconnect_*.desktop +%{_kde4_datadir}/kde4/services/kdeconnect*.desktop %{_kde4_datadir}/kde4/services/kded/kdeconnect.desktop %{_kde4_datadir}/kde4/services/plasma-kdeconnect.desktop %{_kde4_datadir}/kde4/servicetypes/kdeconnect_plugin.desktop #icons -%{_datadir}/icons/hicolor/*/apps/kdeconnect.* +%{_kde4_iconsdir}/hicolor/*/apps/kdeconnect.* + +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig + +%files libs +%{_kde4_libdir}/libkdeconnectinterfaces.so.1* + +%files devel +%{_kde4_includedir}/KDEConnect/ +%{_kde4_includedir}/kdeconnect/ +%{_kde4_libdir}/cmake/KDEConnect/ +%{_kde4_libdir}/libkdeconnectinterfaces.so %changelog +* Sat Jun 28 2014 Rex Dieter - 0.7-1 +- kde-connect-0.7 (#1114196) +- Requires: fuse-sshfs (#1114197) +- Requires: qca-ossl +- -libs, -devel subpkgs + * Sun Jun 08 2014 Fedora Release Engineering - 0.6-0.3.20140305git52901898 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild @@ -104,4 +135,4 @@ fi - New release * Thu Jan 02 2014 Martin Briza - 0.4.2-1 -- Initial package \ No newline at end of file +- Initial package diff --git a/sources b/sources index 6d9632b..4fa1ddd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3ba9cc1578a4041c82c99b16c83ed16 kdeconnect-kde-0.6.tar.xz +88e4b90085f37864779bb83320a2166a kdeconnect-kde-0.7.tar.xz