diff --git a/SOURCES/openvswitch-3.4.0.patch b/SOURCES/openvswitch-3.4.0.patch index 33129a7..107cdc0 100644 --- a/SOURCES/openvswitch-3.4.0.patch +++ b/SOURCES/openvswitch-3.4.0.patch @@ -2557,6 +2557,37 @@ index facd680ff3..354382f111 100644 } } +diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in +index f129bc6462..8092fb5dbf 100644 +--- a/rhel/openvswitch-fedora.spec.in ++++ b/rhel/openvswitch-fedora.spec.in +@@ -141,7 +141,7 @@ License: ASL 2.0 + This provides shared library, libopenswitch.so and the openvswitch header + files needed to build an external application. + +-%if 0%{?rhel} > 7 || 0%{?fedora} > 28 ++%if 0%{?rhel} > 7 || (0%{?fedora} > 28 && 0%{?fedora} < 41) + %package -n network-scripts-%{name} + Summary: Open vSwitch legacy network service support + License: ASL 2.0 +@@ -424,7 +424,7 @@ fi + %exclude %{_libdir}/*.la + %exclude %{_libdir}/*.a + +-%if 0%{?rhel} > 7 || 0%{?fedora} > 28 ++%if 0%{?rhel} > 7 || (0%{?fedora} > 28 && 0%{?fedora} < 41) + %files -n network-scripts-%{name} + %{_sysconfdir}/sysconfig/network-scripts/ifup-ovs + %{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs +@@ -451,7 +451,7 @@ fi + %{_unitdir}/ovs-vswitchd.service + %{_unitdir}/ovs-delete-transient-ports.service + %{_datadir}/openvswitch/scripts/openvswitch.init +-%if ! (0%{?rhel} > 7 || 0%{?fedora} > 28) ++%if ! (0%{?rhel} > 7 || (0%{?fedora} > 28 && 0%{?fedora} < 41)) + %{_sysconfdir}/sysconfig/network-scripts/ifup-ovs + %{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs + %endif diff --git a/rhel/usr_lib_systemd_system_openvswitch-ipsec.service b/rhel/usr_lib_systemd_system_openvswitch-ipsec.service index 92dad44f93..a4bf475d0c 100644 --- a/rhel/usr_lib_systemd_system_openvswitch-ipsec.service diff --git a/SPECS/openvswitch3.4.spec b/SPECS/openvswitch3.4.spec index 497884e..e63d410 100644 --- a/SPECS/openvswitch3.4.spec +++ b/SPECS/openvswitch3.4.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.4.0 -Release: 41%{?dist} +Release: 42%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -770,6 +770,12 @@ exit 0 %endif %changelog +* Thu Feb 06 2025 Open vSwitch CI - 3.4.0-42 +- Merging upstream branch-3.4 [RH git: a79a343588] + Commit list: + f72cf70e56 fedora: Don't generate network-scripts-openvswitch for ver > 40. + + * Fri Jan 31 2025 Kevin Traynor - 3.4.0-41 - redhat: update ovsci Jenkins URL [RH git: a5660fc459] Signed-off-by: Kevin Traynor