diff --git a/.gitignore b/.gitignore index 57c4595..a9a1d39 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1 @@ -/kactivities-4.100.0.tar.xz -/kactivities-5.0.0.tar.xz -/kactivities-5.1.0.tar.xz -/kactivities-5.2.0.tar.xz -/kactivities-5.3.0.tar.xz -/kactivities-5.4.0.tar.xz -/kactivities-5.5.0.tar.xz -/kactivities-5.6.0.tar.xz -/kactivities-5.7.0.tar.xz -/kactivities-5.8.0.tar.xz -/kactivities-5.9.0.tar.xz -/kactivities-5.10.0.tar.xz -/kactivities-5.11.0.tar.xz -/kactivities-5.12.0.tar.xz -/kactivities-5.13.0.tar.xz -/kactivities-5.14.0.tar.xz -/kactivities-5.15.0.tar.xz -/kactivities-5.16.0.tar.xz -/kactivities-5.17.0.tar.xz -/kactivities-5.18.0.tar.xz -/kactivities-5.19.0.tar.xz /kactivities-5.20.0.tar.xz -/kactivities-workspace-5.5.0.tar.xz diff --git a/kf5-kactivities.spec b/kf5-kactivities.spec index d39538f..cef9271 100644 --- a/kf5-kactivities.spec +++ b/kf5-kactivities.spec @@ -3,7 +3,7 @@ Name: kf5-%{framework} Summary: A KDE Frameworks 5 Tier 3 to organize user work into separate activities Version: 5.20.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ URL: https://projects.kde.org/kactivities @@ -16,7 +16,6 @@ URL: https://projects.kde.org/kactivities %global stable stable %endif Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz -Source1: http://download.kde.org/stable/kactivities/kactivities-workspace-5.5.0.tar.xz BuildRequires: boost-devel BuildRequires: extra-cmake-modules >= %{version} @@ -62,7 +61,7 @@ Requires: qt5-qtbase-devel %prep -%setup -a 1 -n %{framework}-%{version} +%setup -q -n %{framework}-%{version} %build @@ -72,16 +71,9 @@ pushd %{_target_platform} popd make %{?_smp_mflags} -C %{_target_platform} -mkdir %{_target_platform}-workspace -pushd %{_target_platform}-workspace -%{cmake_kf5} .. -popd -make %{?_smp_mflags} -C %{_target_platform}-workspace - %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-workspace %post libs -p /sbin/ldconfig @@ -103,6 +95,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-workspace %changelog +* Sun Apr 03 2016 Rex Dieter - 5.20.0-3 +- drop kactivities-workspace here (moved to kactivitymanagerd instead) + * Fri Mar 25 2016 Rex Dieter 5.20.0-2 - provide no main pkg anymore (Obsoletes'd by kactivitymanger-5.5.0+) diff --git a/sources b/sources index 57fc2b9..4184b85 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ 7dc889ce8dc8d58fc74270b2462acef7 kactivities-5.20.0.tar.xz -e1eac5fa8c9cf4e72efe019500292130 kactivities-workspace-5.5.0.tar.xz