On Tue, Aug 07, 2018 at 06:52:10PM +0200, Timothy Redaelli wrote:
> Starting from Fedora 29, the legacy network scripts are installed in
> the "network-scripts" package and so the network scripts ("ifup-ovs",
> "ifdown-ovs") should be installed only when the "network-scripts" package
> is installed.
>
> This commit introduces (on Fedora 29+) a new subpackage
> (network-scripts-openvswitch). This subpackage is installed, by default, only
> if the "network-scripts" package is installed too (reverse weak dependency).
The package's name is following a new format that other projects are
using too.
The dnf installs weak dependencies unless told otherwise.
It requires the network-scripts if installed.
Conditionals look okay.
Looks correct if I read the guidelines correctly:
https://fedoraproject.org/wiki/Packaging:Guidelines
It build the rpms correctly over here.
Acked-by: Flavio Leitner <[email protected]>
Thanks Timothy and Lubomir.
fbl
> Reported-by: Lubomir Rintel <[email protected]>
> Reported-at: https://src.fedoraproject.org/rpms/openvswitch/pull-request/4
> Signed-off-by: Timothy Redaelli <[email protected]>
> ---
> rhel/openvswitch-fedora.spec.in | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
> index 9f8664e95..eead10069 100644
> --- a/rhel/openvswitch-fedora.spec.in
> +++ b/rhel/openvswitch-fedora.spec.in
> @@ -162,6 +162,18 @@ Provides: openvswitch-static = %{version}-%{release}
> This provides static library, libopenswitch.a and the openvswitch header
> files needed to build an external application.
>
> +%if 0%{?rhel} > 7 || 0%{?fedora} > 28
> +%package -n network-scripts-%{name}
> +Summary: Open vSwitch legacy network service support
> +License: ASL 2.0
> +Requires: network-scripts
> +Supplements: (%{name} and network-scripts)
> +
> +%description -n network-scripts-%{name}
> +This provides the ifup and ifdown scripts for use with the legacy network
> +service.
> +%endif
> +
> %package ovn-central
> Summary: Open vSwitch - Open Virtual Network support
> License: ASL 2.0
> @@ -529,6 +541,12 @@ fi
> %{_includedir}/openflow/*
> %{_includedir}/ovn/*
>
> +%if 0%{?rhel} > 7 || 0%{?fedora} > 28
> +%files -n network-scripts-%{name}
> +%{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
> +%{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
> +%endif
> +
> %files
> %defattr(-,openvswitch,openvswitch)
> %dir %{_sysconfdir}/openvswitch
> @@ -546,8 +564,10 @@ fi
> %{_unitdir}/ovs-vswitchd.service
> %{_unitdir}/ovs-delete-transient-ports.service
> %{_datadir}/openvswitch/scripts/openvswitch.init
> +%if ! (0%{?rhel} > 7 || 0%{?fedora} > 28)
> %{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
> %{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
> +%endif
> %{_datadir}/openvswitch/bugtool-plugins/
> %{_datadir}/openvswitch/scripts/ovs-bugtool-*
> %{_datadir}/openvswitch/scripts/ovs-check-dead-ifs
> --
> 2.17.1
>
> _______________________________________________
> dev mailing list
> [email protected]
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
--
Flavio
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
