[kdelibs] drop kactivities conditional
Rex Dieter
rdieter at fedoraproject.org
Tue Nov 29 14:02:34 UTC 2011
commit 3d3282dafe9162afb88718581dce0eb66a0db1c0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Tue Nov 29 08:03:19 2011 -0600
drop kactivities conditional
kdelibs.spec | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
---
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 <rdieter at fedoraproject.org> 4.7.80-2
+- drop kactivities conditional
+
* Fri Nov 18 2011 Jaroslav Reznik <jreznik at redhat.com> 4.7.80-1
- 4.7.80 (beta 1)
More information about the scm-commits
mailing list