Accepting request 253911 from home:olh:branches:graphics

- add Conflicts: libjpeg-6.2.0 to libjpeg62 to obsolete old version
  and to avoid file conflicts

OBS-URL: https://build.opensuse.org/request/show/253911
OBS-URL: https://build.opensuse.org/package/show/graphics/libjpeg-turbo?expand=0&rev=43
This commit is contained in:
OBS User mrdocs 2014-10-04 20:59:46 +00:00 committed by Git OBS Bridge
parent bdc9f35a21
commit 1c74662dc1
3 changed files with 9 additions and 0 deletions

View File

@ -3,7 +3,9 @@ libjpeg8-devel
conflicts "jpeg-devel-<targettype>"
provides "jpeg-devel-<targettype>"
libjpeg62
conflicts "libjpeg-<targettype> = 6.2.0"
libjpeg62-devel
conflicts "libjpeg-devel-<targettype> = 6.2.0"
conflicts "jpeg-devel-<targettype>"
provides "jpeg-devel-<targettype>"
libturbojpeg0

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Oct 4 14:57:19 UTC 2014 - olaf@aepfle.de
- add Conflicts: libjpeg-6.2.0 to libjpeg62 to obsolete old version
and to avoid file conflicts
-------------------------------------------------------------------
Mon Mar 31 09:32:32 UTC 2014 - pgajdos@suse.com

View File

@ -52,6 +52,7 @@ Summary: The MMX/SSE accelerated JPEG compression/decompression library
Group: System/Libraries
Provides: libjpeg%{major} = %{version}
Obsoletes: libjpeg%{major} < %{version}
Conflicts: libjpeg = 6.2.0
# bug437293
%ifarch ppc64
Obsoletes: libjpeg-64bit < %{version}