From 2f235b7c551c7a25886477c1abd12f849d59c244 Mon Sep 17 00:00:00 2001 From: rdobuilder Date: Mar 01 2023 13:29:43 +0000 Subject: Update network-scripts-openvswitch to 3.1 For compatibility with openvswitch3.1 [1]. [1] https://review.rdoproject.org/r/c/deps/rdo-openvswitch/+/47275 Related-to: https://review.rdoproject.org/r/q/I90529221ad682c1b3781d0b8700cf0e449f026a1 --- diff --git a/SPECS/openstack-network-scripts.spec b/SPECS/openstack-network-scripts.spec index 1f67c82..c9bffd1 100644 --- a/SPECS/openstack-network-scripts.spec +++ b/SPECS/openstack-network-scripts.spec @@ -19,7 +19,7 @@ Requires: gawk \ %global upstream_name initscripts Version: 10.11.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 @@ -27,9 +27,9 @@ URL: https://github.com/fedora-sysv/initscripts Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{upstream_name}-%{version}.tar.gz # network-scripts-openvswitch was removed in openvswitch2.17 for RHEL/CS9 %if 0%{?rhel} > 8 -%global ovs_version 2.17 -Source1: https://raw.githubusercontent.com/openvswitch/ovs/branch-2.17/rhel/etc_sysconfig_network-scripts_ifup-ovs -Source2: https://raw.githubusercontent.com/openvswitch/ovs/branch-2.17/rhel/etc_sysconfig_network-scripts_ifdown-ovs +%global ovs_version 3.1 +Source1: https://raw.githubusercontent.com/openvswitch/ovs/branch-3.1/rhel/etc_sysconfig_network-scripts_ifup-ovs +Source2: https://raw.githubusercontent.com/openvswitch/ovs/branch-3.1/rhel/etc_sysconfig_network-scripts_ifdown-ovs %endif BuildRequires: filesystem >= 3 @@ -130,6 +130,7 @@ License: ASL 2.0 Requires: network-scripts Provides: network-scripts-openvswitch%{ovs_version} Obsoletes: network-scripts-openvswitch%{ovs_version} +Obsoletes: network-scripts-openvswitch2.17 %description openvswitch%{ovs_version} This provides the ifup and ifdown scripts for use with the legacy network @@ -238,6 +239,9 @@ fi # ============================================================================= %changelog +* Wed Mar 01 2023 Alfredo Moralejo - 10.11.1-4 +- Update network-scripts-openvswitch to 3.1 + * Thu Jan 19 2023 Alfredo Moralejo - 10.11.1-3 - Obsolete network-scripts-openvswitch2.17 to fix upgrade path from el8