- move Obsoletes: libjpeg to main pkg
This commit is contained in:
parent
07be2195fb
commit
02c0fce6b5
@ -1,6 +1,6 @@
|
|||||||
Name: libjpeg-turbo
|
Name: libjpeg-turbo
|
||||||
Version: 0.0.93
|
Version: 0.0.93
|
||||||
Release: 11%{?dist}
|
Release: 12%{?dist}
|
||||||
Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files
|
Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -17,6 +17,10 @@ BuildRequires: nasm
|
|||||||
Patch0: libjpeg-turbo-programs.patch
|
Patch0: libjpeg-turbo-programs.patch
|
||||||
Patch1: libjpeg-turbo-nosimd.patch
|
Patch1: libjpeg-turbo-nosimd.patch
|
||||||
|
|
||||||
|
# moved this from -utils, in an attempt to get it to better override
|
||||||
|
# libjpeg in rawhide -- Rex
|
||||||
|
Obsoletes: libjpeg < 6b-47
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The libjpeg-turbo package contains a library of functions for manipulating
|
The libjpeg-turbo package contains a library of functions for manipulating
|
||||||
JPEG images
|
JPEG images
|
||||||
@ -36,7 +40,6 @@ will manipulate JPEG files using the libjpeg-turbo library
|
|||||||
%package utils
|
%package utils
|
||||||
Summary: Utilities for manipulating JPEG images
|
Summary: Utilities for manipulating JPEG images
|
||||||
Group: Applications/Multimedia
|
Group: Applications/Multimedia
|
||||||
Obsoletes: libjpeg < 6b-47
|
|
||||||
Provides: libjpeg = 6b-47
|
Provides: libjpeg = 6b-47
|
||||||
Requires: libjpeg-turbo%{?_isa} = %{version}-%{release}
|
Requires: libjpeg-turbo%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
@ -112,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_mandir}/man1/wrjpgcom.1*
|
%{_mandir}/man1/wrjpgcom.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 30 2010 Rex Dieter <rdieter@fedoraproject.org. 0.9.93-12
|
||||||
|
- move Obsoletes: libjpeg to main pkg
|
||||||
|
|
||||||
* Wed Jun 30 2010 Rex Dieter <rdieter@fedoraproject.org> 0.0.93-11
|
* Wed Jun 30 2010 Rex Dieter <rdieter@fedoraproject.org> 0.0.93-11
|
||||||
- -utils: Requires: %%name ...
|
- -utils: Requires: %%name ...
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user