diff --git a/kde-connect.spec b/kde-connect.spec index a7b010f..bd2dca8 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -1,3 +1,9 @@ +%global _with_kde4 0 +%global _with_qt4 0 +%if 0%{?fedora} <= 22 +%global _with_kde4 1 +%endif + %define _git_describe v0.8-231-gfdf91aa Name: kde-connect @@ -8,6 +14,7 @@ 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 +Source1: http://download.kde.org/unstable/kdeconnect/%{version}/src/kdeconnect-kde-%{version}.tar.xz BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules @@ -21,6 +28,14 @@ BuildRequires: kf5-kdbusaddons-devel BuildRequires: kf5-kcmutils-devel BuildRequires: kf5-kiconthemes-devel +%if %{_with_kde4} +BuildRequires: kdelibs4-devel +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(libfakekey) +BuildRequires: pkgconfig(QJson) +BuildRequires: pkgconfig(qca2) +%endif + Requires: kf5-filesystem %description @@ -38,6 +53,19 @@ 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} +%description kde4-libs +%{summary}. + +%package kde4-ioslave +Summary: %{name} KDE4 kioslave +Requires: %{name} = %{version}-%{release} +%description kde4-ioslave +%{summary}. + %package devel Summary: Development files for %{name} Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -55,27 +83,62 @@ popd make %{?_smp_mflags} -C %{_target_platform} +%if %{_with_kde4} +mkdir -p %{_builddir}/kde4 +cd %{_builddir}/kde4 +tar xfJ %{SOURCE1} +cd kdeconnect-kde-%{version} +mkdir -p %{_target_platform} +pushd %{_target_platform} + %{cmake_kde4} .. +popd + +make %{?_smp_mflags} -C %{_target_platform} + +%endif + %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%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}%{_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 %post -/sbin/ldconfig touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : %postun -/sbin/ldconfig if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : 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 %doc COPYING README %{_libexecdir}/kdeconnectd @@ -97,17 +160,20 @@ fi %{_kf5_libdir}/libkdeconnectinterfaces.so.0* %{_kf5_libdir}/libkdeconnectcore.so.0* -%files devel -#%{_kf5_includedir}/KDEConnect/ -#%{_kf5_includedir}/kdeconnect/ -#%{_kf5_libdir}/cmake/KDEConnect/ -#%{_kf5_libdir}/libkdeconnectcore.so -#%{_kf5_libdir}/libkdeconnectinterfaces.so +%if %{_with_kde4} +%files kde4-libs +%{_kde4_libdir}/libkdeconnectinterfaces.so.1* + +%files kde4-ioslave +%{_kde4_datadir}/kde4/services/kdeconnect.protocol +%{_kde4_libdir}/kde4/kio_kdeconnect.so +%endif + %changelog * Mon Apr 20 2015 Helio Chissini de Castro - 0.8-2 -- KDE Connect KF5 snapshot based on 0.8 +- KDE Connect KF5 snapshot based on 0.8and kioslave for KDE 4 * Sun Feb 22 2015 Rex Dieter 0.8-1 - KDE Connect 0.8 available (#1195011) diff --git a/sources b/sources index bd47623..230b350 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 7440336c6a67f023668ce32b997d42f8 kdeconnect-kde-v0.8-231-gfdf91aa.tar.xz +43fbad180dc5412c8c0131399acaceea kdeconnect-kde-0.8.tar.xz