[kde-workspace/f20] BuildConflicts: nepomuk-core-devel
Rex Dieter
rdieter at fedoraproject.org
Wed Jul 2 12:08:44 UTC 2014
commit 84fa84edb22f1ae5aec4737f295cc939d005431a
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Wed Jul 2 07:08:53 2014 -0500
BuildConflicts: nepomuk-core-devel
kde-workspace.spec | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/kde-workspace.spec b/kde-workspace.spec
index 8e19a77..b5ebbec 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -186,6 +186,8 @@ BuildRequires: kactivities-devel >= 4.11.5
%if 0%{?nepomuk}
BuildRequires: nepomuk-core-devel >= 4.11.5
BuildRequires: pkgconfig(soprano)
+%else
+BuildConflicts: nepomuk-core-devel
%endif
BuildRequires: libjpeg-devel
BuildRequires: libutempter-devel
@@ -1087,7 +1089,7 @@ fi
%changelog
* Wed Jul 02 2014 Rex Dieter <rdieter at fedoraproject.org> 4.11.10-6
-- rebuild (kde-4.13)
+- BuildConflicts: nepomuk-core-devel
* Thu Jun 19 2014 Rex Dieter <rdieter at fedoraproject.org> 4.11.10-5
- BR: kdelibs4-webkit-devel
More information about the scm-commits
mailing list