rdma-core: use systemd_requires, own srp_daemon directory

Signed-off-by: Jarod Wilson <jarod@redhat.com>
This commit is contained in:
Jarod Wilson 2017-08-09 16:18:58 -04:00
parent c016866231
commit 82bec3fb8c
1 changed files with 8 additions and 10 deletions

View File

@ -1,6 +1,6 @@
Name: rdma-core Name: rdma-core
Version: 14 Version: 14
Release: 3%{?dist} Release: 4%{?dist}
Summary: RDMA core userspace libraries and daemons Summary: RDMA core userspace libraries and daemons
# Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license
@ -175,9 +175,7 @@ displays information about RDMA devices.
%package -n ibacm %package -n ibacm
Summary: InfiniBand Communication Manager Assistant Summary: InfiniBand Communication Manager Assistant
Requires(post): systemd-units %{?systemd_requires}
Requires(preun): systemd-units
Requires(postun): systemd-units
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: libibumad%{?_isa} = %{version}-%{release} Requires: libibumad%{?_isa} = %{version}-%{release}
Requires: libibverbs%{?_isa} = %{version}-%{release} Requires: libibverbs%{?_isa} = %{version}-%{release}
@ -194,9 +192,7 @@ library knows how to talk directly to the ibacm daemon to retrieve data.
%package -n iwpmd %package -n iwpmd
Summary: iWarp Port Mapper userspace daemon Summary: iWarp Port Mapper userspace daemon
Requires(post): systemd-units %{?systemd_requires}
Requires(preun): systemd-units
Requires(postun): systemd-units
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n iwpmd %description -n iwpmd
@ -242,9 +238,7 @@ Summary: Tools for using the InfiniBand SRP protocol devices
Obsoletes: srptools <= 1.0.3 Obsoletes: srptools <= 1.0.3
Provides: srptools = %{version}-%{release} Provides: srptools = %{version}-%{release}
Obsoletes: openib-srptools <= 0.0.6 Obsoletes: openib-srptools <= 0.0.6
Requires(post): systemd-units %{?systemd_requires}
Requires(preun): systemd-units
Requires(postun): systemd-units
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: libibumad%{?_isa} = %{version}-%{release} Requires: libibumad%{?_isa} = %{version}-%{release}
Requires: libibverbs%{?_isa} = %{version}-%{release} Requires: libibverbs%{?_isa} = %{version}-%{release}
@ -489,6 +483,7 @@ rm -rf %{buildroot}/%{_initrddir}/
%files -n srp_daemon %files -n srp_daemon
%config(noreplace) %{_sysconfdir}/srp_daemon.conf %config(noreplace) %{_sysconfdir}/srp_daemon.conf
%dir %{_libexecdir}/srp_daemon
%{_libexecdir}/srp_daemon/start_on_all_ports %{_libexecdir}/srp_daemon/start_on_all_ports
%{_unitdir}/srp_daemon.service %{_unitdir}/srp_daemon.service
%{_unitdir}/srp_daemon_port@.service %{_unitdir}/srp_daemon_port@.service
@ -504,6 +499,9 @@ rm -rf %{buildroot}/%{_initrddir}/
%doc %{_docdir}/%{name}-%{version}/ibsrpdm.md %doc %{_docdir}/%{name}-%{version}/ibsrpdm.md
%changelog %changelog
* Wed Aug 09 2017 Jarod Wilson <jarod@redhat.com> - 14-4
- Make use of systemd_requires, own srp_daemon dir
* Tue Aug 01 2017 Jarod Wilson <jarod@redhat.com> - 14-3 * Tue Aug 01 2017 Jarod Wilson <jarod@redhat.com> - 14-3
- Revert work-around for ppc64le library issues - Revert work-around for ppc64le library issues
- Add Obsoletes/Provides for libusnic_verbs - Add Obsoletes/Provides for libusnic_verbs