[libjpeg-turbo-compat] - don't obsolete/provide libjpeg (#887013)

[Adam Tkac]

commit 4bf40a180a84c55ca57d26abaa02d5fe07392e9c
Author: Adam Tkac <atkac at redhat.com>
Date:   Mon Dec 17 13:31:34 2012 +0100

    - don't obsolete/provide libjpeg (#887013)
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 libjpeg-turbo-compat.spec |   27 +++++++--------------------
 1 files changed, 7 insertions(+), 20 deletions(-)
---
diff --git a/libjpeg-turbo-compat.spec b/libjpeg-turbo-compat.spec
index 2d61938..312ccf8 100644
--- a/libjpeg-turbo-compat.spec
+++ b/libjpeg-turbo-compat.spec
@@ -2,7 +2,7 @@
 
 Name:		libjpeg-turbo-compat
 Version:	1.2.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A MMX/SSE2 accelerated library for manipulating JPEG image files
 
 Group:		System Environment/Libraries
@@ -15,15 +15,7 @@ BuildRequires:	autoconf, automake, libtool
 BuildRequires:	nasm
 %endif
 
-# moved this from -utils, in an attempt to get it to better override
-# libjpeg in rawhide -- Rex
-Obsoletes:	libjpeg < 6b-47
-# add provides (even if it not needed) to workaround bad packages, like
-# java-1.6.0-openjdk (#rh607554) -- atkac
-Provides:	libjpeg = 6b-47%{?dist}
-%if "%{?_isa}" != ""
-Provides:	libjpeg%{_isa} = 6b-47%{?dist}
-%endif
+# Don't obsolete/provide libjpeg, the libjpeg-turbo pkg does it
 
 Patch0:		libjpeg-turbo12-noinst.patch
 
@@ -34,11 +26,7 @@ library of functions for manipulating JPEG images.
 %package devel
 Summary:	Headers for the libjpeg-turbo-compat library
 Group:		Development/Libraries
-Obsoletes:	libjpeg-devel < 6b-47
-Provides:	libjpeg-devel = 6b-47%{?dist}
-%if "%{?_isa}" != ""
-Provides:	libjpeg-devel%{_isa} = 6b-47%{?dist}
-%endif
+# This compat pkg doesn't obsolete/provide libjpeg-devel, libjpeg-turbo-devel does it
 Requires:	libjpeg-turbo-compat%{?_isa} = %{version}-%{release}
 
 %description devel
@@ -48,11 +36,7 @@ will manipulate JPEG files using the libjpeg-turbo-compat library.
 %package static
 Summary:	Static version of the libjpeg-turbo-compat library
 Group:		Development/Libraries
-Obsoletes:	libjpeg-static < 6b-47
-Provides:	libjpeg-static = 6b-47%{?dist}
-%if "%{?_isa}" != ""
-Provides:	libjpeg-static%{_isa} = 6b-47%{?dist}
-%endif
+# Don't obsolete/provide libjpeg-static, libjpeg-turbo-static does it
 Requires:	libjpeg-turbo-compat-devel%{?_isa} = %{version}-%{release}
 
 %description static
@@ -113,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT/%{_mandir}
 %{_libdir}/libjpeg-turbo-compat/libjpeg.a
 
 %changelog
+* Mon Dec 17 2012 Adam Tkac <atkac redhat com> 1.2.1-6
+- don't obsolete/provide libjpeg (#887013)
+
 * Wed Oct 24 2012 Adam Tkac <atkac redhat com> 1.2.1-5
 - move libjpeg.a into libdir/libjpeg-turbo-compat/
 - some review related fixes