diff --git a/SOURCES/openvswitch-3.2.0.patch b/SOURCES/openvswitch-3.2.0.patch index 0dd7ce6..a03a41f 100644 --- a/SOURCES/openvswitch-3.2.0.patch +++ b/SOURCES/openvswitch-3.2.0.patch @@ -87,13 +87,17 @@ index db341504d..439e2bf6d 100644 @if cmp -s $(@F).tmp $@; then \ touch $@; \ diff --git a/NEWS b/NEWS -index a3a5c2e4a..790cab495 100644 +index a3a5c2e4a..eb7a9b1ba 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,6 @@ -+v3.2.1 - xx xxx xxxx +@@ -1,3 +1,10 @@ ++v3.2.2 - xx xxx xxxx +-------------------- + ++v3.2.1 - 17 Oct 2023 ++-------------------- ++ - Bug fixes ++ v3.2.0 - 17 Aug 2023 -------------------- - OVSDB: @@ -258,7 +262,7 @@ index ee5553f45..3e937910b 100755 sys.exit(1) for line in s.splitlines(): diff --git a/configure.ac b/configure.ac -index 320509c5f..5857ac8e6 100644 +index 320509c5f..764479514 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ @@ -266,7 +270,7 @@ index 320509c5f..5857ac8e6 100644 AC_PREREQ(2.63) -AC_INIT(openvswitch, 3.2.0, bugs@openvswitch.org) -+AC_INIT(openvswitch, 3.2.1, bugs@openvswitch.org) ++AC_INIT(openvswitch, 3.2.2, bugs@openvswitch.org) AC_CONFIG_SRCDIR([vswitchd/ovs-vswitchd.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -284,15 +288,21 @@ index 320509c5f..5857ac8e6 100644 AC_PROG_CXX AC_PROG_CPP diff --git a/debian/changelog b/debian/changelog -index 8757e5cb2..385fe9716 100644 +index 8757e5cb2..780d1e2d8 100644 --- a/debian/changelog +++ b/debian/changelog -@@ -1,3 +1,9 @@ +@@ -1,3 +1,15 @@ ++openvswitch (3.2.2-1) unstable; urgency=low ++ [ Open vSwitch team ] ++ * New upstream version ++ ++ -- Open vSwitch team Tue, 17 Oct 2023 13:02:27 +0200 ++ +openvswitch (3.2.1-1) unstable; urgency=low + [ Open vSwitch team ] + * New upstream version + -+ -- Open vSwitch team Thu, 17 Aug 2023 15:20:36 +0200 ++ -- Open vSwitch team Tue, 17 Oct 2023 13:02:27 +0200 + openvswitch (3.2.0-1) unstable; urgency=low diff --git a/SPECS/openvswitch3.2.spec b/SPECS/openvswitch3.2.spec index 6c58882..3b8fcbc 100644 --- a/SPECS/openvswitch3.2.spec +++ b/SPECS/openvswitch3.2.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.2.0 -Release: 17%{?dist} +Release: 18%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -761,6 +761,13 @@ exit 0 %endif %changelog +* Tue Oct 17 2023 Open vSwitch CI - 3.2.0-18 +- Merging upstream branch-3.2 [RH git: 40527bedef] + Commit list: + 0ebd8cdbf7 Prepare for 3.2.2. + cd5dee5b9d Set release date for 3.2.1. + + * Wed Oct 11 2023 Timothy Redaelli - 3.2.0-17 - redhat: use rhpkg push instead of git push [RH git: 5bcbc4c7bc]