12
0

Accepting request 329678 from home:wolfi323:test

- Add an explicit conflict with kio-extras5 < 15.08.0. Some files from kio-extras5 have been moved to plasma5-workspace in 5.4, this should prevent a possible file conflict. (boo#944656)

OBS-URL: https://build.opensuse.org/request/show/329678
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=110
This commit is contained in:
Hrvoje Senjan
2015-09-08 14:51:02 +00:00
committed by Git OBS Bridge
parent a8ab23b317
commit d248850334
2 changed files with 9 additions and 0 deletions

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Sep 8 10:36:15 UTC 2015 - wbauer@tmo.at
- Add an explicit conflict with kio-extras5 < 15.08.0. Some files
from kio-extras5 have been moved to plasma5-workspace in 5.4,
this should prevent a possible file conflict. (boo#944656)
-------------------------------------------------------------------
Mon Aug 24 17:53:13 UTC 2015 - hrvoje.senjan@gmail.com

View File

@@ -90,6 +90,8 @@ BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(zlib)
Conflicts: kdebase4-workspace < 5.3.0
# Some files have been moved from kio-extras5 to plasma5-workspace in 5.4. This should prevent a possible file conflict. (boo#944656)
Conflicts: kio-extras5 < 15.08.0
Requires: %{name}-branding = %{version}
Requires: %{name}-libs = %{version}-%{release}
# used within startup