From fbcb196405a26338149e62454d39cba7e8539ead Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Thu, 28 Mar 2024 11:27:44 +0000
Subject: [PATCH] import CS pykickstart-3.32.11-1.el9

---
 .gitignore                             |  2 +-
 .pykickstart.metadata                  |  2 +-
 SOURCES/pykickstart-3.32.10.tar.gz.asc | 11 -----------
 SOURCES/pykickstart-3.32.11.tar.gz.asc | 11 +++++++++++
 SPECS/pykickstart.spec                 | 18 +++++++++++++++++-
 5 files changed, 30 insertions(+), 14 deletions(-)
 delete mode 100644 SOURCES/pykickstart-3.32.10.tar.gz.asc
 create mode 100644 SOURCES/pykickstart-3.32.11.tar.gz.asc

diff --git a/.gitignore b/.gitignore
index 4500f59..961924c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/pykickstart-3.32.10.tar.gz
+SOURCES/pykickstart-3.32.11.tar.gz
diff --git a/.pykickstart.metadata b/.pykickstart.metadata
index ea50c05..f33f8e9 100644
--- a/.pykickstart.metadata
+++ b/.pykickstart.metadata
@@ -1 +1 @@
-3bf33c8f89bfcac82ec418b1efc1678d76c90a23 SOURCES/pykickstart-3.32.10.tar.gz
+ce8269b1693305f43d1ad9758f015b7edfc139d1 SOURCES/pykickstart-3.32.11.tar.gz
diff --git a/SOURCES/pykickstart-3.32.10.tar.gz.asc b/SOURCES/pykickstart-3.32.10.tar.gz.asc
deleted file mode 100644
index 825b91c..0000000
--- a/SOURCES/pykickstart-3.32.10.tar.gz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEEtMa0UeT6i0IyyhkeEX6MFo7+On8FAmRL+XYACgkQEX6MFo7+
-On+WFwgAmUPGJAP2omVIiC9PKmyd4H3Ks/bmwmz40P68Xoy+RYRBFVAhLj/FONia
-E2Z8ezn+1q6/97yLwX2fLcxI8F6sXeDRfGprIUpyYmPl9t90QA7WmhEEi2+SkJqr
-d+x2VXcIRNWXtdq5hR9fF0HntGuEsgIxK67sVPD48RDhIbi8rCyIy2plJSkV1iOe
-bGEtnJMNDJAhtSQtkRADmTJMtDPZzRwAcok2mqgGUwliipzUBdAdh6efrapIkWKB
-SH4Ya3muqgNhsVI4O09d/+E9kEm4noPra7MYPS7mphPn7UayG0OixXtxxoAB36Rw
-6OFF79oGiev3rCcKCCJ1GKRTb02Q2A==
-=jVEm
------END PGP SIGNATURE-----
diff --git a/SOURCES/pykickstart-3.32.11.tar.gz.asc b/SOURCES/pykickstart-3.32.11.tar.gz.asc
new file mode 100644
index 0000000..09efe74
--- /dev/null
+++ b/SOURCES/pykickstart-3.32.11.tar.gz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEEtMa0UeT6i0IyyhkeEX6MFo7+On8FAmVvXckACgkQEX6MFo7+
+On9S4gf+MMRlPLpcPYfxH0JAS0l1x0y+DYlcAYMlcQo75t0Yu57B+Is6SeVRYUVt
+c5WNIk0fIKMhLJDTsDqm1UFYQcAqn0d5sZKH65+IMATEY/Z2+1crbfu9sB8h8hcQ
+adzHxyjm05uadaHTBrHvk5oFVZCw7NE2GSXVuGMTgtIHDXH0vyHZq8dCNb2482cC
+6X2HMce29RwCZcQa2rm2vUxWycnTIdwl6Qbv9F7g1p9qzrTivJlNoQQHDipQVhG8
+omgd5bk922StJ0PNgKWycY9BIoRC9aOukos9o+Gkd1LU+OIcTXCUiqte2y+j90yG
+DSOlqTUBdscJlHpukngzsCEzyk998g==
+=/wKX
+-----END PGP SIGNATURE-----
diff --git a/SPECS/pykickstart.spec b/SPECS/pykickstart.spec
index eaa5107..fc7cf6a 100644
--- a/SPECS/pykickstart.spec
+++ b/SPECS/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