- versioned obsoletes to allow co-exist with libjpeg6

Changed files:
    libjpeg-turbo.spec -> 1.83

diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec
index 5556935e8011a4f5e63cfce387dcc5ad51643b33..ff4b02cd8fe40264641b9744996108d82c79cc3d 100644 (file)
--- a/libjpeg-turbo.spec
+++ b/libjpeg-turbo.spec
@@ -1,11 +1,11 @@
 %bcond_without tests
-#
-%define        libjpeg_ver     8c
+
+%define                libjpeg_ver     8c
 Summary:       A MMX/SSE2 accelerated library for manipulating JPEG image files
 Summary(pl.UTF-8):     Biblioteka do obróbki plików obrazów JPEG z akceleracją MMX/SSE2
 Name:          libjpeg-turbo
 Version:       1.1.1
-Release:       2
+Release:       3
 License:       wxWidgets
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/libjpeg-turbo/%{name}-%{version}.tar.gz
@@ -19,7 +19,7 @@ BuildRequires:        libtool
 BuildRequires: libtool
 BuildRequires: nasm
 Provides:      libjpeg = %{libjpeg_ver}
-Obsoletes:     libjpeg
+Obsoletes:     libjpeg >= %{libjpeg_ver}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,7 +40,7 @@ Summary(pl.UTF-8):    Pliki nagłówkowe do tworzenia programów przy użyciu libjp
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Provides:      libjpeg-devel = %{libjpeg_ver}
-Obsoletes:     libjpeg-devel
+Obsoletes:     libjpeg-devel >= %{libjpeg_ver}
 Conflicts:     libjpeg6-devel
 
 %description devel
@@ -90,7 +90,7 @@ Summary(uk.UTF-8):    Статична бібліотека для програму
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 Provides:      libjpeg-static = %{libjpeg_ver}
-Obsoletes:     libjpeg-static
+Obsoletes:     libjpeg-static >= %{libjpeg_ver}
 Conflicts:     libjpeg-turbo6-static
 
 %description static
@@ -118,7 +118,7 @@ Summary(pl.UTF-8):  Kilka prostych programów do manipulowania na plikach JPEG
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Provides:      libjpeg-progs = %{libjpeg_ver}
-Obsoletes:     libjpeg-progs
+Obsoletes:     libjpeg-progs >= %{libjpeg_ver}
 Conflicts:     libjpeg-turbo6-progs
 
 %description progs