From de2451b1003eac02495cd2afa6b896207dbdf9c8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 26 Aug 2015 09:05:13 -0500 Subject: [PATCH] 0.8-7 - fresh snapshot, use releaseme to include translations - tighten subpkg deps - .spec cosmetics --- .gitignore | 1 + kde-connect.spec | 110 ++++++++++++++++++++++++++--------------------- sources | 2 +- 3 files changed, 63 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 5a2d2c5..4fdbfd1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /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 diff --git a/kde-connect.spec b/kde-connect.spec index 1003521..e066ab6 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -1,40 +1,45 @@ -%global _with_kde4 0 -%global _with_qt4 0 -#if 0%{?fedora} <= 22 +# once kf5 dolphin lands, may consider disabling this -- rex %global _with_kde4 1 -#endif # After tag v0.8 with Frameworks -%define _git_describe v0.8-329-g43161b3 +%define _git_describe v0.8-339-g2b34d28 Name: kde-connect Version: 0.8 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Summary: KDE Connect client for communication with smartphones Url: https://projects.kde.org/projects/playground/base/kdeconnect-kde -Source0: http://download.kde.org/unstable/kdeconnect/%{version}/src/kdeconnect-kde-%{_git_describe}.tar.xz +%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 +%endif Source1: http://download.kde.org/unstable/kdeconnect/%{version}/src/kdeconnect-kde-%{version}.tar.xz + # Upstream patch for KDE 4 version -Patch0: kdeconnect-kde-0.8-b-revision.patch +Patch0: kdeconnect-kde-0.8-b-revision.patch -BuildRequires: kf5-rpm-macros +BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtdeclarative-devel -BUildRequires: qt5-qtx11extras-devel -BuildRequires: qca-qt5-devel -BuildRequires: kf5-ki18n-devel -Buildrequires: kf5-kio-devel +BuildRequires: kf5-rpm-macros +BuildRequires: kf5-kcmutils-devel BuildRequires: kf5-kconfigwidgets-devel BuildRequires: kf5-kdbusaddons-devel -BuildRequires: kf5-kcmutils-devel +BuildRequires: kf5-ki18n-devel BuildRequires: kf5-kiconthemes-devel +Buildrequires: kf5-kio-devel BuildRequires: kf5-knotifications-devel BuildRequires: libXtst-devel -BuildRequires: libfakekey-devel -BuildRequires: desktop-file-utils +BuildRequires: pkgconfig(libfakekey) +BuildRequires: qca-qt5-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtdeclarative-devel +BUildRequires: qt5-qtx11extras-devel %if %{_with_kde4} BuildRequires: kdelibs4-devel @@ -44,9 +49,10 @@ BuildRequires: pkgconfig(QJson) BuildRequires: pkgconfig(qca2) %endif +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: kf5-filesystem -Requires: fuse-sshfs -Requires: qca-qt5-ossl +Requires: fuse-sshfs +Requires: qca-qt5-ossl %description KDE Connect adds communication between KDE and your smartphone. @@ -57,22 +63,20 @@ 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 Requires: %{name} = %{version}-%{release} %description libs %{summary}. %package kde4-libs Summary: Runtime libraries for %{name} KDE4 kioslave -# when -libs was introduced, upgrade path for multilib'd kde-connect -Requires: %{name} = %{version}-%{release} +# 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} = %{version}-%{release} +Requires: %{name}-kde4-libs%{?_isa} = %{version}-%{release} Requires: fuse-sshfs %description kde4-ioslave %{summary}. @@ -83,11 +87,13 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel %{summary}. + %prep %setup -q -n kdeconnect-kde-%{version} + %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kf5} .. popd @@ -106,24 +112,29 @@ pushd %{_target_platform} popd make %{?_smp_mflags} -C %{_target_platform} - %endif + %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} + +%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 # Remove undesired kde4 devel files -rm -rf %{buildroot}%{_includedir}/kde4 -rm -rf %{buildroot}%{_libdir}/cmake +rm -rf %{buildroot}%{_includedir}/kde4/ +rm -rf %{buildroot}%{_libdir}/cmake/ rm -rf %{buildroot}%{_kde4_libdir}/libkdeconnectinterfaces.so %endif + %check -desktop-file-edit --remove-not-show-in=Plasma --add-not-show-in=X-Plasma %{buildroot}/%{_datadir}/applications/kdeconnect-non-plasma.desktop -desktop-file-edit --remove-not-show-in=Plasma --add-not-show-in=X-Plasma %{buildroot}/%{_datadir}/applications/kdeconnect.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/kdeconnect-non-plasma.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/kdeconnect.desktop + %post touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : @@ -137,25 +148,11 @@ if [ $1 -eq 0 ] ; then gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : fi -%post libs -/sbin/ldconfig - -%postun libs -/sbin/ldconfig - -%if %{_with_kde4} -%post kde4-libs -/sbin/ldconfig - -%postun kde4-libs -/sbin/ldconfig -%endif - -%files +%files -f %{name}.lang %doc COPYING %{_libexecdir}/kdeconnectd %{_kf5_bindir}/kdeconnect-cli -%{_kf5_datadir}/plasma/* +%{_kf5_datadir}/plasma/plasmoids/org.kde.kdeconnect/ %{_kf5_datadir}/knotifications5/* %{_kf5_datadir}/kservices5/*.desktop %{_kf5_datadir}/kservices5/*.protocol @@ -163,16 +160,25 @@ fi %{_datadir}/dbus-1/services/*.service %{_datadir}/icons/hicolor/*/*/* %{_datadir}/applications/*.desktop -%{_qt5_prefix}/qml/org/kde/kdeconnect/* -%{_qt5_prefix}/plugins/* +%{_qt5_prefix}/qml/org/kde/kdeconnect/ +%{_qt5_prefix}/plugins/kcm_kdeconnect.so +%{_qt5_prefix}/plugins/kio_kdeconnect.so +%{_qt5_prefix}/plugins/kdeconnect*.so +%{_qt5_prefix}/plugins/kdeconnect/ %{_sysconfdir}/xdg/autostart/kdeconnectd.desktop +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig + %files libs %{_kf5_libdir}/libkdeconnectpluginkcm.so.0* %{_kf5_libdir}/libkdeconnectinterfaces.so.0* %{_kf5_libdir}/libkdeconnectcore.so.0* %if %{_with_kde4} +%post kde4-libs -p /sbin/ldconfig +%postun kde4-libs -p /sbin/ldconfig + %files kde4-libs %{_kde4_libdir}/libkdeconnectinterfaces.so.1* @@ -181,7 +187,13 @@ fi %{_kde4_libdir}/kde4/kio_kdeconnect.so %endif + %changelog +* Wed Aug 26 2015 Rex Dieter - 0.8-7 +- fresh snapshot, use releaseme to include translations +- tighten subpkg deps +- .spec cosmetics + * Fri Aug 07 2015 Helio Chissini de Castro - 0.8-6 - Added missing requires, qca-qt5-ossl. Thanks to Stefano Cavallari diff --git a/sources b/sources index 504654b..2eca51d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -a56882ef374d3cef20bd8b23c7d3c165 kdeconnect-kde-v0.8-329-g43161b3.tar.xz 43fbad180dc5412c8c0131399acaceea kdeconnect-kde-0.8.tar.xz +87af553e44cdaba02f4b14ba6e73ab41 kdeconnect-kde-v0.8-339-g2b34d28.tar.xz