From 57b574f9c2c4f1488886ac45ae6690bd3f51acde Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Tue, 5 Dec 2023 09:42:31 -0800
Subject: [PATCH] - tox: Only run unit tests for python 3.6 (bcl)   Related:
 RHEL-17662 - Add conflict test between ostree sources (#2125655) (jkonecny)  
 Related: RHEL-17662 - Fix missing seen check for output generation (#2125655)
 (jkonecny)   Related: RHEL-17662 - Add new ostreecontainer command (#2125655)
 (jkonecny)   Resolves: RHEL-17662 - Check the conflicting commands
 automatically (vponcova)   Related: RHEL-17662 - Fix tests for conflicting
 commands (vponcova)   Related: RHEL-17662 - Add conflicting commands support
 (bcl)   Related: RHEL-17662

---
 .gitignore       |  2 ++
 pykickstart.spec | 18 +++++++++++++++++-
 sources          |  4 ++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 786b790..aa9213a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -236,3 +236,5 @@ pykickstart-1.78.tar.gz
 /pykickstart-3.32.9.tar.gz.asc
 /pykickstart-3.32.10.tar.gz
 /pykickstart-3.32.10.tar.gz.asc
+/pykickstart-3.32.11.tar.gz
+/pykickstart-3.32.11.tar.gz.asc
diff --git a/pykickstart.spec b/pykickstart.spec
index eaa5107..fc7cf6a 100644
--- a/pykickstart.spec
+++ b/pykickstart.spec
@@ -4,7 +4,7 @@
 %bcond_with runtests
 
 Name:      pykickstart
-Version:   3.32.10
+Version:   3.32.11
 Release:   1%{?dist}
 License:   GPLv2 and MIT
 Summary:   Python utilities for manipulating kickstart files.
@@ -79,6 +79,22 @@ make PYTHON=%{__python3} test
 %{python3_sitelib}/pykickstart*.egg-info
 
 %changelog
+* Tue Dec 05 2023 Brian C. Lane <bcl@redhat.com> - 3.32.11-1
+- tox: Only run unit tests for python 3.6 (bcl)
+  Related: RHEL-17662
+- Add conflict test between ostree sources (#2125655) (jkonecny)
+  Related: RHEL-17662
+- Fix missing seen check for output generation (#2125655) (jkonecny)
+  Related: RHEL-17662
+- Add new ostreecontainer command (#2125655) (jkonecny)
+  Resolves: RHEL-17662
+- Check the conflicting commands automatically (vponcova)
+  Related: RHEL-17662
+- Fix tests for conflicting commands (vponcova)
+  Related: RHEL-17662
+- Add conflicting commands support (bcl)
+  Related: RHEL-17662
+
 * Fri Apr 28 2023 Brian C. Lane <bcl@redhat.com> - 3.32.10-1
 - Add DNS handling options to the network command (vslavik)
   Resolves: rhbz#2172531
diff --git a/sources b/sources
index cfe37f6..7f42469 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (pykickstart-3.32.10.tar.gz) = a83f6e67689fdced355f73b5f34cdd87d78fa0f7c0f1bcb4c92e58435c9d0a85bfbdec9d4e9ca6ffae8d83fb0362dc4895cb2ec871de737034d73eeb1dc1ad1c
-SHA512 (pykickstart-3.32.10.tar.gz.asc) = cf32cdee0ca6f568189b4ee767f7f63dc445599e7fca2e98880b334237cf37bf6b2b19f31191236bc749b7e7b6c3b04bae8fa34fd50409f3ea5db8636a1ddf08
+SHA512 (pykickstart-3.32.11.tar.gz) = e12021cf7cdb39250603b42cff4f3f84e6ef09a914e5343c644795d436a5bd0b5da61b308dc89cde08047957dc21f732c3032caca0ed6e5e5d86a33a52fe0a5f
+SHA512 (pykickstart-3.32.11.tar.gz.asc) = 90efd1eef08a847dd3177915c182db72bceae90e2b503c2455dbf349868cec7b01e76d0e488fc630ab341bc0ce860fd441e550f8ea8196d5aa0dd433f0af6490