From 3c565cc1d937be217af39b54af8a20ac43ac4532 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 18 Oct 2012 14:23:49 +0200 Subject: [PATCH] Minor provides tuning (#863231) Signed-off-by: Adam Tkac --- libjpeg-turbo.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index 1bf49df..7e2aa0e 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -1,6 +1,6 @@ Name: libjpeg-turbo Version: 1.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files Group: System Environment/Libraries @@ -19,7 +19,10 @@ BuildRequires: nasm 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 +Provides: libjpeg = 6b-47%{?dist} +%if "%{?_isa}" != "" +Provides: libjpeg%{_isa} = 6b-47%{?dist} +%endif Patch0: libjpeg-turbo12-noinst.patch @@ -31,9 +34,9 @@ JPEG images. Summary: Headers for the libjpeg-turbo library Group: Development/Libraries Obsoletes: libjpeg-devel < 6b-47 -Provides: libjpeg-devel = 6b-47 +Provides: libjpeg-devel = 6b-47%{?dist} %if "%{?_isa}" != "" -Provides: libjpeg-devel%{_isa} = 6b-47 +Provides: libjpeg-devel%{_isa} = 6b-47%{?dist} %endif Requires: libjpeg-turbo%{?_isa} = %{version}-%{release} @@ -59,9 +62,9 @@ text comments into a JPEG file. Summary: Static version of the libjpeg-turbo library Group: Development/Libraries Obsoletes: libjpeg-static < 6b-47 -Provides: libjpeg-static = 6b-47 +Provides: libjpeg-static = 6b-47%{?dist} %if "%{?_isa}" != "" -Provides: libjpeg-static%{_isa} = 6b-47 +Provides: libjpeg-static%{_isa} = 6b-47%{?dist} %endif Requires: libjpeg-turbo-devel%{?_isa} = %{version}-%{release} @@ -156,6 +159,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/turbojpeg.h %changelog +* Thu Oct 18 2012 Adam Tkac 1.2.1-3 +- minor provides tuning (#863231) + * Thu Jul 19 2012 Fedora Release Engineering - 1.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild