diff --git a/kdelibs.spec b/kdelibs.spec index 3984658..81582b6 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -18,12 +18,9 @@ %global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver}) %global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver}) -## exclude libkactivities or not -%define no_libkactivities 1 - Summary: KDE Libraries Version: 4.7.80 -Release: 1%{?dist} +Release: 2%{?dist} Name: kdelibs Epoch: 6 @@ -242,9 +239,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: kdelibs4-devel < %{version}-%{release} Provides: kdelibs4-devel = %{version}-%{release} %{?_isa:Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}} -%if ! 0%{?no_libkactivities} -Provides: libkactivities-devel = 5 -%endif Requires: automoc4 >= 0.9.88 Requires: cmake >= 2.6.4 Requires: pkgconfig(libattica) >= %{attica_ver} @@ -335,7 +329,6 @@ mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} \ -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" \ - %{?no_libkactivities:-DBUILD_libkactivities:BOOL=OFF} \ .. popd @@ -573,6 +566,9 @@ rm -rf %{buildroot} %changelog +* Tue Nov 29 2011 Rex Dieter 4.7.80-2 +- drop kactivities conditional + * Fri Nov 18 2011 Jaroslav Reznik 4.7.80-1 - 4.7.80 (beta 1)