packages: libjpeg-turbo/libjpeg-turbo.spec - versioned obsoletes to allow c...

[glen]

Author: glen                         Date: Sat Oct  1 19:07:36 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- versioned obsoletes to allow co-exist with libjpeg6

---- Files affected:
packages/libjpeg-turbo:
   libjpeg-turbo.spec (1.82 -> 1.83) 

---- Diffs:

================================================================
Index: packages/libjpeg-turbo/libjpeg-turbo.spec
diff -u packages/libjpeg-turbo/libjpeg-turbo.spec:1.82 packages/libjpeg-turbo/libjpeg-turbo.spec:1.83
--- packages/libjpeg-turbo/libjpeg-turbo.spec:1.82	Wed Aug 31 21:13:27 2011
+++ packages/libjpeg-turbo/libjpeg-turbo.spec	Sat Oct  1 21:07:31 2011
@@ -1,12 +1,12 @@
 # $Revision$, $Date$
 %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
@@ -20,7 +20,7 @@
 BuildRequires:	libtool
 BuildRequires:	nasm
 Provides:	libjpeg = %{libjpeg_ver}
-Obsoletes:	libjpeg
+Obsoletes:	libjpeg >= %{libjpeg_ver}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,7 +41,7 @@
 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
@@ -91,7 +91,7 @@
 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
@@ -119,7 +119,7 @@
 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
@@ -219,6 +219,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.83  2011/10/01 19:07:31  glen
+- versioned obsoletes to allow co-exist with libjpeg6
+
 Revision 1.82  2011/08/31 19:13:27  baggins
 - rel 2
 - instead of dropping turbojpeg make it versioned
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libjpeg-turbo/libjpeg-turbo.spec?r1=1.82&r2=1.83&f=u