Tighten explicit libs sub-package requirement so that it includes

the correct architecture as well (bug #731421 comment #8).
This commit is contained in:
Tim Waugh 2011-08-19 15:18:49 +01:00
parent cf15da723a
commit f6b6480f24

View File

@ -8,7 +8,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4.8 Version: 1.4.8
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -74,7 +74,7 @@ Epoch: 1
Url: http://www.cups.org/ Url: http://www.cups.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: /sbin/chkconfig /sbin/service Requires: /sbin/chkconfig /sbin/service
Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%if %use_alternatives %if %use_alternatives
Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat
Requires: /usr/sbin/alternatives Requires: /usr/sbin/alternatives
@ -138,7 +138,7 @@ Requires: ghostscript-cups
Summary: Common Unix Printing System - development environment Summary: Common Unix Printing System - development environment
Group: Development/Libraries Group: Development/Libraries
License: LGPLv2 License: LGPLv2
Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: gnutls-devel Requires: gnutls-devel
Requires: krb5-devel Requires: krb5-devel
Requires: zlib-devel Requires: zlib-devel
@ -154,7 +154,7 @@ License: LGPLv2
Summary: Common Unix Printing System - lpd emulation Summary: Common Unix Printing System - lpd emulation
Group: System Environment/Daemons Group: System Environment/Daemons
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: xinetd Requires: xinetd
%package php %package php
@ -577,6 +577,10 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Fri Aug 19 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.8-3
- Tighten explicit libs sub-package requirement so that it includes
the correct architecture as well (bug #731421 comment #8).
* Fri Aug 19 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.8-2 * Fri Aug 19 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.8-2
- Avoid GIF reader loop (CVE-2011-2896, STR #3914, bug #727800). - Avoid GIF reader loop (CVE-2011-2896, STR #3914, bug #727800).