From b96de7cf551740f63cb2c08fae4ce89226fb1575 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Wed, 15 May 2024 08:39:18 +0000
Subject: [PATCH] Import from AlmaLinux stable repository

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

diff --git a/.gitignore b/.gitignore
index e19c58b..961924c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/pykickstart-3.32.9.tar.gz
+SOURCES/pykickstart-3.32.11.tar.gz
diff --git a/.pykickstart.metadata b/.pykickstart.metadata
index 0066c86..f33f8e9 100644
--- a/.pykickstart.metadata
+++ b/.pykickstart.metadata
@@ -1 +1 @@
-40ab454a065eeb0d14bf21e61723607d0b51581f SOURCES/pykickstart-3.32.9.tar.gz
+ce8269b1693305f43d1ad9758f015b7edfc139d1 SOURCES/pykickstart-3.32.11.tar.gz
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/SOURCES/pykickstart-3.32.9.tar.gz.asc b/SOURCES/pykickstart-3.32.9.tar.gz.asc
deleted file mode 100644
index 6e7f36c..0000000
--- a/SOURCES/pykickstart-3.32.9.tar.gz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEEtMa0UeT6i0IyyhkeEX6MFo7+On8FAmN4EvwACgkQEX6MFo7+
-On/7iAgAkpB+929NE4C6bkC+8s6eM066B19lP3ziZE0igmQxUu8HESdrgrhsZbgy
-v68OHx+8+dcJi4g5YY2n6AnGTej0//skWb6ZcK0NEF0SqiYmVsfOlqjPYygg9nWC
-eIH5wgidHA1gLCV3TR+Q2oDQce4jFeQWzJcT0hdcx8UJNAmh8SjbPrlM6veqryLE
-Vhj4EESXJ8yOkGW8EaYXohDZ1J1TB3S6/6Yz9mqwI9xjVkpsZog6CKuDrMl7RpPf
-ZIVrs4R5iobWEddYbJgEfXGuPZ6PXfmAg17SPVUpZs6ekd/Q4s/KNzrO7015/nfs
-mPXBVA/plxaleC5jOXPtb0UU/WTBCA==
-=YaYZ
------END PGP SIGNATURE-----
diff --git a/SPECS/pykickstart.spec b/SPECS/pykickstart.spec
index 65f8344..fc7cf6a 100644
--- a/SPECS/pykickstart.spec
+++ b/SPECS/pykickstart.spec
@@ -4,7 +4,7 @@
 %bcond_with runtests
 
 Name:      pykickstart
-Version:   3.32.9
+Version:   3.32.11
 Release:   1%{?dist}
 License:   GPLv2 and MIT
 Summary:   Python utilities for manipulating kickstart files.
@@ -79,6 +79,28 @@ 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
+- whitelist_externals has changed to allowlist_externals (bcl)
+  Related: rhbz#2172531
+
 * Fri Nov 18 2022 Brian C. Lane <bcl@redhat.com> - 3.32.9-1
 - sshkey: Escapes quotes in the ssh key (bcl)
   Resolves: rhbz#2121877