Petr Gajdos 2013-05-17 09:08:39 +00:00 committed by Git OBS Bridge
parent 66bbca049c
commit 9a3a2f2f76
3 changed files with 7 additions and 9 deletions

View File

@ -1,4 +1,9 @@
libjpeg8
libjpeg8-devel
conflicts "jpeg-devel-<targettype>"
provides "jpeg-devel-<targettype>"
libjpeg62
libjpeg62-devel
conflicts "jpeg-devel-<targettype>"
provides "jpeg-devel-<targettype>"

View File

@ -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}

View File

@ -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}