From d79190325f7e7648cdae4b44e94a667477c354a08f4237382a8a47d7454a15eb Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 15 Oct 2014 13:42:43 +0000 Subject: [PATCH] - Obsolete jpeg version 6b, 8.0.1 and 8.0.2 to avoid conflicts during zypper dup OBS-URL: https://build.opensuse.org/package/show/graphics/libjpeg-turbo?expand=0&rev=46 --- libjpeg-turbo.changes | 6 ++++++ libjpeg-turbo.spec | 3 +++ 2 files changed, 9 insertions(+) diff --git a/libjpeg-turbo.changes b/libjpeg-turbo.changes index 94e19c2..bee9213 100644 --- a/libjpeg-turbo.changes +++ b/libjpeg-turbo.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 15 11:39:09 UTC 2014 - olaf@aepfle.de + +- Obsolete jpeg version 6b, 8.0.1 and 8.0.2 to avoid conflicts + during zypper dup + ------------------------------------------------------------------- Mon Mar 31 09:29:11 UTC 2014 - pgajdos@suse.com diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index 9c6812f..99f0eee 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -41,6 +41,9 @@ Patch2: libjpeg-ocloexec.patch BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: yasm +Obsoletes: jpeg = 6b +Obsoletes: jpeg = 8.0.1 +Obsoletes: jpeg = 8.0.2 Provides: jpeg = %{version} Obsoletes: jpeg < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build