From d66cd2b808fedcdb44c8981ede5f60dff004ae391b8be7308fa532c51a106ca4 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 20 Jun 2015 16:44:05 +0000 Subject: [PATCH] Accepting request 312852 from home:Ansus:branches:KDE:Frameworks5 remove not needed explicit conflict OBS-URL: https://build.opensuse.org/request/show/312852 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=51 --- kinfocenter5.changes | 6 ++++++ kinfocenter5.spec | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/kinfocenter5.changes b/kinfocenter5.changes index fb9c392..c8b3dbf 100644 --- a/kinfocenter5.changes +++ b/kinfocenter5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jun 20 16:27:16 UTC 2015 - anixx@opensuse.org + +- remove explicit conflict with KDE3, there in no such file at + this location in kdebase3 + ------------------------------------------------------------------- Fri May 22 15:29:39 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kinfocenter5.spec b/kinfocenter5.spec index 9804375..c61bf42 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -59,8 +59,6 @@ BuildRequires: pkgconfig(glu) BuildRequires: kwayland-devel >= 5.0.95 %endif Conflicts: kdebase4-workspace < 5.3.0 -# /etc/xdg/menus/kde-information.menu -Conflicts: kdebase3 %if %{with lang} Recommends: %{name}-lang %endif