7 changed files with 178 additions and 172 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,11 @@
-SOURCES/pyudev-0.21.0.tar.gz
+/pyudev-0.15.tar.gz
+/pyudev-0.16.1.tar.gz
+/pyudev-0.17.tar.gz
+/pyudev-0.18.1.tar.gz
+/pyudev-0.19.0.tar.gz
+/pyudev-0.20.0.tar.gz
 /pyudev-0.21.0.tar.gz
+/pyudev-0.22.0.tar.gz
+/pyudev-0.23.2.tar.gz
+/pyudev-0.24.0.tar.gz
+/pyudev-0.24.1.tar.gz
--- a/ci.fmf
+++ b/ci.fmf
@ -0,0 +1 @@
+resultsdb-testcase: separate
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +1,25 @@
 --- !Policy
 product_versions:
-  - rhel-8
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+ 
+#Rawhide
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+ 
+#gating rhel
+--- !Policy
+product_versions:
+  - rhel-*
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
--- a/plans.fmf
+++ b/plans.fmf
@ -0,0 +1,36 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/python-pyudev.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/python-pyudev.git
+      name: /plans/tier1/public
+
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/python-pyudev.git
+      name: /plans/tier2-tier3/internal
+
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/python-pyudev.git
+      name: /plans/tier2-tier3/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/python-pyudev.git
+      name: /plans/others/internal
+
+/others-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/python-pyudev.git
+      name: /plans/others/public
+
--- a/python-pyudev.spec
+++ b/python-pyudev.spec
@ -1,19 +1,16 @@
 %global srcname pyudev
-
-%if 0%{?rhel} == 8
-%bcond_with python2
-%bcond_with qt4
+%if 0%{?rhel} > 9
+%bcond_with qt
 %else
-%bcond_without python2
-%bcond_without qt4
+%bcond_without qt
 %endif

 Name:             python-%{srcname}
-Version:          0.21.0
-Release:          7%{?dist}
+Version:          0.24.1
+Release:          9%{?dist}
 Summary:          A libudev binding

-License:          LGPLv2+
+License:          LGPL-2.1-or-later
 URL:              http://pypi.python.org/pypi/pyudev
 Source0:          https://pypi.io/packages/source/p/%{srcname}/%{srcname}-%{version}.tar.gz

@ -25,104 +22,7 @@ and hardware management and information library for Linux.  It supports
 almost all libudev functionality, you can enumerate devices, query device
 properties and attributes or monitor devices, including asynchronous
 monitoring with threads, or within the event loops of Qt, Glib or wxPython.
-
-The binding supports CPython 2 (2.6 or newer) and 3 (3.1 or newer), and
-PyPy 1.5 or newer.  It is tested against udev 151 or newer, earlier
-versions of udev as found on dated Linux systems may work, but are not
-officially supported.
-
-%if %{with python2}
-%package -n python2-%{srcname}
-Summary:          A libudev binding
-%{?python_provide:%python_provide python2-%{srcname}}
-
-BuildRequires:    python2-devel
-BuildRequires:    python2-setuptools
-
-# Dependencies for libraries loaded through ctypes
-# glibc is needed for pipe2. This is not needed in the python3 package.
-Requires:         glibc
-
-# Needed for libudev
-Requires:         systemd-libs
-
-# Used for python2/3 compatibility
-Requires:         python2-six
-
-%description -n python2-%{srcname}
-pyudev is a LGPL licensed, pure Python binding for libudev, the device
-and hardware management and information library for Linux.  It supports
-almost all libudev functionality, you can enumerate devices, query device
-properties and attributes or monitor devices, including asynchronous
-monitoring with threads, or within the event loops of Qt, Glib or wxPython.
-
-The binding supports CPython 2 (2.6 or newer) and 3 (3.1 or newer), and
-PyPy 1.5 or newer.  It is tested against udev 151 or newer, earlier
-versions of udev as found on dated Linux systems may work, but are not
-officially supported.
-
-%package -n python2-%{srcname}-glib
-Summary:          GLib integration for pyudev
-
-Requires:         pygobject2
-Requires:         python2-%{srcname} = %{version}-%{release}
-
-%description -n python2-%{srcname}-glib
-GLib integration for pyudev.
-
-This package provides a module pyudev.glib that contains classes for
-integrating a pyudev monitor with the GLib main loop.
-
-%if %{with qt4}
-%package -n python2-%{srcname}-qt4
-Summary:          Qt4 integration for pyudev
-
-Requires:         PyQt4
-Requires:         python2-%{srcname} = %{version}-%{release}
-
-%description -n python2-%{srcname}-qt4
-Qt4 integration for pyudev.
-
-This package provides a module pyudev.pyqt4 that contains classes for
-integrating a pyudev monitor with the Qt4 main loop.
-%endif
-
-%package -n python2-%{srcname}-qt5
-Summary:          Qt5 integration for pyudev
-
-Requires:         python-qt5
-Requires:         python2-%{srcname} = %{version}-%{release}
-
-%description -n python2-%{srcname}-qt5
-Qt5 integration for pyudev.
-
-This package provides a module pyudev.pyqt5 that contains classes for
-integrating a pyudev monitor with the Qt4 main loop.
-
-%package -n python2-%{srcname}-pyside
-Summary:           PySide integration for pyudev
-
-Requires:          python-pyside
-Requires:          python2-%{srcname} = %{version}-%{release}
-
-%description -n python2-%{srcname}-pyside
-PySide integration for pyudev.
-
-This package provides a module pyudev.pyside that contains classes for
-integrating a pyudev monitor with the PySide main loop.
-
-%package -n python2-%{srcname}-wx
-Summary:            wxPython integration for pyudev
-
-Requires:           wxPython
-Requires:           python2-%{srcname} = %{version}-%{release}
-
-%description -n python2-%{srcname}-wx
-wxPython integration for pyudev.
-
-This package provides a module pyudev.wx that contains classes for
-integrating a pyudev montior with the wxPython main loop.
-%endif
+The binding supports CPython 3 and PyPy.

 %package -n python3-%{srcname}
 Summary:          A libudev binding
@ -134,22 +34,15 @@ BuildRequires:    python3-setuptools
 # Needed for libudev, loaded through ctypes
 Requires:         systemd-libs

-# Used for python2/3 compatibility
-Requires:         python3-six
-
 %description -n python3-%{srcname}
 pyudev is a LGPL licensed, pure Python binding for libudev, the device
 and hardware management and information library for Linux.  It supports
 almost all libudev functionality, you can enumerate devices, query device
 properties and attributes or monitor devices, including asynchronous
 monitoring with threads, or within the event loops of Qt, Glib or wxPython.
+The binding supports CPython 3 and PyPy.

-The binding supports CPython 2 (2.6 or newer) and 3 (3.1 or newer), and
-PyPy 1.5 or newer.  It is tested against udev 151 or newer, earlier
-versions of udev as found on dated Linux systems may work, but are not
-officially supported.
-
-%if %{with qt4}
+%if %{with qt}
 %package -n python3-%{srcname}-qt4
 Summary:          Qt4 integration for pyudev

@ -161,7 +54,6 @@ Qt4 integration for pyudev.

 This package provides a module pyudev.pyqt4 that contains classes for
 integrating a pyudev monitor with the Qt4 main loop.
-%endif

 %package -n python3-%{srcname}-qt5
 Summary:          Qt5 integration for pyudev
@ -174,60 +66,18 @@ Qt5 integration for pyudev.

 This package provides a module pyudev.pyqt5 that contains classes for
 integrating a pyudev monitor with the Qt5 main loop.
+%endif

 %prep
 %autosetup -n %{srcname}-%{version}
 rm -rf pyudev.egg-info

 %build
-%if %{with python2}
-%py2_build
-%endif
-
 %py3_build

 %install
-%if %{with python2}
-%py2_install
-%endif
-
 %py3_install

-%if %{with python2}
-%files -n python2-%{srcname}
-%license COPYING
-%doc README.rst CHANGES.rst
-%{python2_sitelib}/pyudev/
-%{python2_sitelib}/pyudev-%{version}-*.egg-info
-%exclude %{python2_sitelib}/pyudev/glib.py*
-%exclude %{python2_sitelib}/pyudev/pyqt4.py*
-%exclude %{python2_sitelib}/pyudev/pyqt5.py*
-%exclude %{python2_sitelib}/pyudev/pyside.py*
-%exclude %{python2_sitelib}/pyudev/wx.py*
-
-%files -n python2-%{srcname}-glib
-%license COPYING
-%{python2_sitelib}/pyudev/glib.py*
-
-%if %{with qt4}
-%files -n python2-%{srcname}-qt4
-%license COPYING
-%{python2_sitelib}/pyudev/pyqt4.py*
-%endif
-
-%files -n python2-%{srcname}-qt5
-%license COPYING
-%{python2_sitelib}/pyudev/pyqt5.py*
-
-%files -n python2-%{srcname}-pyside
-%license COPYING
-%{python2_sitelib}/pyudev/pyside.py*
-
-%files -n python2-%{srcname}-wx
-%license COPYING
-%{python2_sitelib}/pyudev/wx.py*
-%endif
-
 %files -n python3-%{srcname}
 %license COPYING
 %doc README.rst CHANGES.rst
@ -244,27 +94,117 @@ rm -rf pyudev.egg-info
 %exclude %{python3_sitelib}/pyudev/wx.py
 %exclude %{python3_sitelib}/pyudev/__pycache__/wx.*

-%if %{with qt4}
+%if %{with qt}
 %files -n python3-%{srcname}-qt4
 %license COPYING
 %{python3_sitelib}/pyudev/pyqt4.py
 %{python3_sitelib}/pyudev/__pycache__/pyqt4.*
-%endif

 %files -n python3-%{srcname}-qt5
 %license COPYING
 %{python3_sitelib}/pyudev/pyqt5.py
 %{python3_sitelib}/pyudev/__pycache__/pyqt5.*
+%endif

 %changelog
-* Thu Jun 14 2018 Yaakov Selkowitz <yselkowi@redhat.com> - 0.21.0-7
- Dropped qt4 from RHEL-8 (#1591123)
+* Thu Jul  4 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 0.24.1-9
+- Dropped Qt RPM subpackages on RHEL > 9
+  Resolves: RHEL-46314

-* Thu May 17 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 0.21.0-6
- Bumped release to fix conflict caused by automerge
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.24.1-8
+- Bump release for June 2024 mass rebuild

-* Mon Apr 30 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 0.21.0-5
- Dropped python2 from RHEL-8
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.24.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.24.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.24.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jun 16 2023 Python Maint <python-maint@redhat.com> - 0.24.1-4
+- Rebuilt for Python 3.12
+
+* Tue Jun 13 2023 mulhern <amulhern@redhat.com> - 0.24.1-3
+- Use SPDX-format license; also make it match upstream
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 0.24.1-2
+- Rebuilt for Python 3.12
+
+* Fri Apr 21 2023 mulhern <amulhern@redhat.com> - 0.24.1-1
+- Update to 0.24.1
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.24.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Aug 25 2022 mulhern <amulhern@redhat.com> - 0.24.0-1
+- Update to 0.24.0
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.23.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.23.2-2
+- Rebuilt for Python 3.11
+
+* Tue Feb 15 2022 mulhern <amulhern@redhat.com> - 0.23.2-1
+- Update to 0.23.2
+
+* Tue Feb 15 2022 mulhern <amulhern@redhat.com> - 0.22.0-8
+- Drop redundant Requires
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.22.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.22.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 0.22.0-5
+- Rebuilt for Python 3.10
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.22.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.22.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 0.22.0-2
+- Rebuilt for Python 3.9
+
+* Wed Feb  5 2020 David Shea <dshea@fedoraproject.org> - 0.22.0-1
+- New upstream version
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.21.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.21.0-13
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 0.21.0-12
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.21.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.21.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Oct 11 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.21.0-9
+- Python2 binary package has been removed
+  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.21.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jun 15 2018 Miro Hrončok <mhroncok@redhat.com> - 0.21.0-7
+- Rebuilt for Python 3.7
+
+* Fri Mar 23 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.21.0-6
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.21.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.21.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (pyudev-0.21.0.tar.gz) = ba5b6156768b65b9655d809b14378b01173643781b9c4017271e880cdfed442c44ac49eb26c970e4275b820e01678e3001870591fccf88dc713ec941e2b85d11
+SHA512 (pyudev-0.24.1.tar.gz) = 10e32d9a74884000fbf8b86bee60530f6e7b936b990e7ae3b76099ace71834602de404721101c1076ef57365622a9a8f4819d57f58508ced09a21b7d50326886