rpms/dhcp
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Use {?_isa} macro to tighten explicit libs sub-package requirement.

Browse Source
This commit is contained in:
Jiri Popelka 2011-08-19 16:53:53 +02:00
parent d7e74c83b3
commit b8f92d8f72
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dhcp.spec
View File

@ -16,7 +16,7 @@
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
Name: dhcp Name: dhcp
Version: 4.2.2 Version: 4.2.2
Release: 2%{?dist} Release: 3%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and # dcantrell maintaining the package) made incorrect use of the epoch and
# that's why it is at 12 now. It should have never been used, but it was. # that's why it is at 12 now. It should have never been used, but it was.
@ -76,7 +76,7 @@ BuildRequires: libcap-ng-devel
BuildRequires: bind-lite-devel BuildRequires: bind-lite-devel
Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires(post): chkconfig Requires(post): chkconfig
Requires(post): coreutils Requires(post): coreutils
Requires(post): systemd-units Requires(post): systemd-units
@ -114,7 +114,7 @@ Summary: Provides the ISC DHCP client daemon and dhclient-script
Group: System Environment/Base Group: System Environment/Base
Requires: initscripts Requires: initscripts
Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires(post): coreutils Requires(post): coreutils
Requires(post): grep Requires(post): grep
Obsoletes: dhcpcd <= 1.3.22pl1-7 Obsoletes: dhcpcd <= 1.3.22pl1-7
@ -140,7 +140,7 @@ provides the ISC DHCP client daemon.
%package common %package common
Summary: Common files used by ISC dhcp client and server Summary: Common files used by ISC dhcp client and server
Group: System Environment/Base Group: System Environment/Base
Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%description common %description common
DHCP (Dynamic Host Configuration Protocol) is a protocol which allows DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
@ -166,7 +166,7 @@ Obsoletes: libdhcp4client-devel <= 12:4.0.0-34
Provides: libdhcp4client-devel = 12:4.0.0-35 Provides: libdhcp4client-devel = 12:4.0.0-35
Obsoletes: libdhcp-devel <= 1.99.8-1 Obsoletes: libdhcp-devel <= 1.99.8-1
Provides: libdhcp-devel = 1.99.8-2 Provides: libdhcp-devel = 1.99.8-2
Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%description devel %description devel
Header files and API documentation for using the ISC DHCP libraries. The Header files and API documentation for using the ISC DHCP libraries. The
@ -639,6 +639,10 @@ fi
%{_initddir}/dhcrelay %{_initddir}/dhcrelay
%changelog %changelog
* Fri Aug 19 2011 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.2-3
- Tighten explicit libs sub-package requirement so that it includes
the correct architecture as well.
* Fri Aug 12 2011 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.2-2 * Fri Aug 12 2011 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.2-2
- #699713: - #699713:
- Use '--enable-paranoia --enable-early-chroot' configure flags - Use '--enable-paranoia --enable-early-chroot' configure flags