diff --git a/baselibs.conf b/baselibs.conf index 002e1b3..84b1ea0 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,9 @@ libjpeg8 libjpeg8-devel + conflicts "jpeg-devel-" + provides "jpeg-devel-" libjpeg62 libjpeg62-devel + conflicts "jpeg-devel-" + provides "jpeg-devel-" + diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index 1413f7f..a19281a 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -22,7 +22,6 @@ %define srcver 1.2.1 %define libver %{major}.%{minor}.%{micro} # major number of library from jpeg8 -%define cmajor 8 Name: libjpeg-turbo Version: %{srcver} @@ -74,9 +73,7 @@ Group: Development/Libraries/C and C++ Requires: libjpeg%{major} = %{version} Provides: libjpeg-devel = %{version} Obsoletes: libjpeg-devel < %{version} -%if "%{major}" != "%{cmajor}" -Conflicts: libjpeg%{cmajor}-devel -%endif +Conflicts: otherproviders(libjpeg-devel) # bug437293 %ifarch ppc64 Obsoletes: libjpeg-devel-64bit < %{version} diff --git a/libjpeg62-turbo.spec b/libjpeg62-turbo.spec index 672d1e7..67d7e53 100644 --- a/libjpeg62-turbo.spec +++ b/libjpeg62-turbo.spec @@ -21,8 +21,6 @@ %define micro 0 %define srcver 1.2.1 %define libver %{major}.%{minor}.%{micro} -# major number of library from jpeg8 -%define cmajor 8 Name: libjpeg62-turbo Version: %{srcver} @@ -74,9 +72,7 @@ Group: Development/Libraries/C and C++ Requires: libjpeg%{major} = %{version} Provides: libjpeg-devel = %{version} Obsoletes: libjpeg-devel < %{version} -%if "%{major}" != "%{cmajor}" -Conflicts: libjpeg%{cmajor}-devel -%endif +Conflicts: otherproviders(libjpeg-devel) # bug437293 %ifarch ppc64 Obsoletes: libjpeg-devel-64bit < %{version}