From 02c0fce6b535778a79073d0abfdeac5394d56b11 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 1 Jul 2010 02:00:00 +0000 Subject: [PATCH] - move Obsoletes: libjpeg to main pkg --- libjpeg-turbo.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index 09f5243..44a0a5d 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -1,6 +1,6 @@ Name: libjpeg-turbo Version: 0.0.93 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files Group: System Environment/Libraries @@ -17,6 +17,10 @@ BuildRequires: nasm Patch0: libjpeg-turbo-programs.patch Patch1: libjpeg-turbo-nosimd.patch +# moved this from -utils, in an attempt to get it to better override +# libjpeg in rawhide -- Rex +Obsoletes: libjpeg < 6b-47 + %description The libjpeg-turbo package contains a library of functions for manipulating JPEG images @@ -36,7 +40,6 @@ will manipulate JPEG files using the libjpeg-turbo library %package utils Summary: Utilities for manipulating JPEG images Group: Applications/Multimedia -Obsoletes: libjpeg < 6b-47 Provides: libjpeg = 6b-47 Requires: libjpeg-turbo%{?_isa} = %{version}-%{release} @@ -112,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/wrjpgcom.1* %changelog +* Wed Jun 30 2010 Rex Dieter 0.0.93-11 - -utils: Requires: %%name ...