From ecd4f90a10c7edb5a2d6e7c4f82eb9086c199315 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 21 May 2019 09:59:20 +0200 Subject: [PATCH 01/30] Fix python3 support, fix dependencies --- fix-requires.patch | 10 +++++++ fix-shebang-lines.patch | 4 +-- python-3-support.patch | 60 +++++++++++++++++++++++++++++++++++++++++ yawn.spec | 21 ++++++++++----- 4 files changed, 87 insertions(+), 8 deletions(-) create mode 100644 fix-requires.patch create mode 100644 python-3-support.patch diff --git a/fix-requires.patch b/fix-requires.patch new file mode 100644 index 0000000..bbc7940 --- /dev/null +++ b/fix-requires.patch @@ -0,0 +1,10 @@ +diff -up yawn-20140318/setup.py.orig2 yawn-20140318/setup.py +--- yawn-20140318/setup.py.orig2 2019-05-13 13:06:16.955524226 +0200 ++++ yawn-20140318/setup.py 2019-05-13 13:06:28.152537623 +0200 +@@ -15,5 +15,5 @@ setup( + author_email = "miminar@redhat.com", + license = "GPL", + description = "Yet Another WBEM Navigator for Apache's mod_wsgi", +- install_requires=['distribute', 'werkzeug', 'mako'] ++ install_requires=['werkzeug', 'mako'] + ) diff --git a/fix-shebang-lines.patch b/fix-shebang-lines.patch index 08edfb6..e99ebce 100644 --- a/fix-shebang-lines.patch +++ b/fix-shebang-lines.patch @@ -3,7 +3,7 @@ diff -up yawn-20140318/scripts/yawn.py.orig yawn-20140318/scripts/yawn.py +++ yawn-20140318/scripts/yawn.py 2019-02-18 13:49:23.708720635 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/python2 ++#!/usr/bin/python3 """ Script for launching YAWN as a standalone web broswer. Note that this is rather for testing purposes, then for production. @@ -12,7 +12,7 @@ diff -up yawn-20140318/scripts/yawn.wsgi.orig yawn-20140318/scripts/yawn.wsgi +++ yawn-20140318/scripts/yawn.wsgi 2019-02-18 13:49:04.332696776 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/python2 ++#!/usr/bin/python3 """ Wrapper for running YAWN application under web server like diff --git a/python-3-support.patch b/python-3-support.patch new file mode 100644 index 0000000..7a1f6d7 --- /dev/null +++ b/python-3-support.patch @@ -0,0 +1,60 @@ +diff -up yawn-20140318/pywbem_yawn/__init__.py.orig yawn-20140318/pywbem_yawn/__init__.py +--- yawn-20140318/pywbem_yawn/__init__.py.orig 2019-05-13 12:21:52.984356124 +0200 ++++ yawn-20140318/pywbem_yawn/__init__.py 2019-05-13 12:30:22.246973082 +0200 +@@ -478,10 +478,10 @@ class Yawn(object): + namespace=namespaces[ins]) + interopns = namespaces[ins] + nsclass = nsclasses[icls] +- except pywbem.CIMError, arg: +- if arg[0] in [pywbem.CIM_ERR_INVALID_NAMESPACE, +- pywbem.CIM_ERR_NOT_SUPPORTED, +- pywbem.CIM_ERR_INVALID_CLASS]: ++ except pywbem.CIMError as arg: ++ if arg.args[0] in [pywbem.CIM_ERR_INVALID_NAMESPACE, ++ pywbem.CIM_ERR_NOT_SUPPORTED, ++ pywbem.CIM_ERR_INVALID_CLASS]: + continue + else: + raise +diff -up yawn-20140318/pywbem_yawn/inputparse.py.orig3 yawn-20140318/pywbem_yawn/inputparse.py +--- yawn-20140318/pywbem_yawn/inputparse.py.orig3 2013-04-26 09:45:08.000000000 +0200 ++++ yawn-20140318/pywbem_yawn/inputparse.py 2019-05-13 13:23:25.449769078 +0200 +@@ -20,7 +20,7 @@ Utilities and functions for parsing user + """ + + import base64 +-import cPickle ++import pickle + import pywbem + import re + import zlib +@@ -50,7 +50,7 @@ def decode_reference(encoded_text): + Decompress object path to python object. + """ + try: +- return cPickle.loads(zlib.decompress(base64.urlsafe_b64decode( ++ return pickle.loads(zlib.decompress(base64.urlsafe_b64decode( + encoded_text))) + except Exception: + raise ReferenceDecodeError(path=encoded_text) +diff -up yawn-20140318/pywbem_yawn/render.py.orig3 yawn-20140318/pywbem_yawn/render.py +--- yawn-20140318/pywbem_yawn/render.py.orig3 2013-01-18 11:14:45.000000000 +0100 ++++ yawn-20140318/pywbem_yawn/render.py 2019-05-13 13:22:57.113734091 +0200 +@@ -19,7 +19,7 @@ + Utilities and functions for template rendering. + """ + import base64 +-import cPickle ++import pickle + import datetime + from collections import defaultdict + import mako.lookup +@@ -227,7 +227,7 @@ def encode_reference(obj): + @return compressed and encoded object. + """ + return base64.urlsafe_b64encode( +- zlib.compress(cPickle.dumps(obj, cPickle.HIGHEST_PROTOCOL))) ++ zlib.compress(pickle.dumps(obj, pickle.HIGHEST_PROTOCOL))) + + def val2str(value): + """ diff --git a/yawn.spec b/yawn.spec index 890071e..958c21f 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.29.%{revdate}svn%{svnrev}%{?dist} +Release: 0.30.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -18,9 +18,11 @@ URL: https://sourceforge.net/apps/mediawiki/pywbem/index.php?title=YA Source0: %{name}-%{revdate}.tar.xz Patch0: fix-shebang-lines.patch +Patch1: python-3-support.patch +Patch2: fix-requires.patch -BuildRequires: httpd, python2-devel -Requires: python2-mod_wsgi, pywbem, httpd, python2-werkzeug, python2-mako +BuildRequires: httpd, python3-devel +Requires: python3-mod_wsgi, python3-pywbem, httpd, python3-werkzeug, python3-mako BuildArch: noarch %description @@ -36,12 +38,14 @@ Script to run yawn without Apache web server. %prep %setup -q -n %{name}-%{revdate} %patch0 -p1 -b .fix-shebang-lines +%patch1 -p1 -b .python-3-support +%patch2 -p1 -b .fix-requires %build -%{__python2} setup.py build +%{__python3} setup.py build %install -%{__python2} setup.py install --skip-build --root ${RPM_BUILD_ROOT} +%{__python3} setup.py install --skip-build --root ${RPM_BUILD_ROOT} mkdir -p $RPM_BUILD_ROOT%{htmldir} install ./scripts/yawn.wsgi $RPM_BUILD_ROOT%{htmldir}/index.wsgi install -d $RPM_BUILD_ROOT%{apacheconfdir}/conf.d/ @@ -52,7 +56,7 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %files %{htmldir} -%{python2_sitelib}/* +%{python3_sitelib}/* %config(noreplace) %{apacheconfdir}/conf.d/yawn.conf %doc README Changelog @@ -60,6 +64,11 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Tue May 21 2019 Vitezslav Crhonek - 0-0.30.20140318svn632 +- Various python2 -> python3 fixes +- Fix dependencies + Resolves: #1701930 + * Tue Feb 19 2019 Vitezslav Crhonek - 0-0.29.20140318svn632 - Fix FTBFS Resolves: #1676255 From 24c6afa897f7d77672e4c94edd116e144a99ccaf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:47:56 +0000 Subject: [PATCH 02/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index 958c21f..c56d7c1 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.30.%{revdate}svn%{svnrev}%{?dist} +Release: 0.31.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -64,6 +64,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0-0.31.20140318svn632 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue May 21 2019 Vitezslav Crhonek - 0-0.30.20140318svn632 - Various python2 -> python3 fixes - Fix dependencies From 5e95e4dcdffefcc557d1ed77de20e4a2489792c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 11:09:53 +0200 Subject: [PATCH 03/30] Rebuilt for Python 3.8 --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index c56d7c1..786fb28 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.31.%{revdate}svn%{svnrev}%{?dist} +Release: 0.32.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -64,6 +64,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Mon Aug 19 2019 Miro Hrončok - 0-0.32.20140318svn632 +- Rebuilt for Python 3.8 + * Sat Jul 27 2019 Fedora Release Engineering - 0-0.31.20140318svn632 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From b8125e90d034a2f2ce957ae848eaa2c50fbaef94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 14:41:51 +0200 Subject: [PATCH 04/30] Rebuilt for Python 3.8.0rc1 (#1748018) --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index 786fb28..71a762b 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.32.%{revdate}svn%{svnrev}%{?dist} +Release: 0.33.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -64,6 +64,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Thu Oct 03 2019 Miro Hrončok - 0-0.33.20140318svn632 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Mon Aug 19 2019 Miro Hrončok - 0-0.32.20140318svn632 - Rebuilt for Python 3.8 From 8b2dc9fb42c604c31740ce99eb7f5339f3c57e65 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 05:06:05 +0000 Subject: [PATCH 05/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index 71a762b..95e686c 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.33.%{revdate}svn%{svnrev}%{?dist} +Release: 0.34.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -64,6 +64,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0-0.34.20140318svn632 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Oct 03 2019 Miro Hrončok - 0-0.33.20140318svn632 - Rebuilt for Python 3.8.0rc1 (#1748018) From 7d7a6658ddd2cb2bfc9ba6822d409b70814a5dcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:55:32 +0200 Subject: [PATCH 06/30] Rebuilt for Python 3.9 --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index 95e686c..211db39 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.34.%{revdate}svn%{svnrev}%{?dist} +Release: 0.35.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -64,6 +64,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Tue May 26 2020 Miro Hrončok - 0-0.35.20140318svn632 +- Rebuilt for Python 3.9 + * Fri Jan 31 2020 Fedora Release Engineering - 0-0.34.20140318svn632 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 8e468840475e7bbe8e768238921b16d6f19078e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:13:17 +0000 Subject: [PATCH 07/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index 211db39..0ed1b77 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.35.%{revdate}svn%{svnrev}%{?dist} +Release: 0.36.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -64,6 +64,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0-0.36.20140318svn632 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 0-0.35.20140318svn632 - Rebuilt for Python 3.9 From f1c7ea93f60747ca947efa7755ff49ba2ee6be40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:32:12 +0000 Subject: [PATCH 08/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index 0ed1b77..ef84305 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.36.%{revdate}svn%{svnrev}%{?dist} +Release: 0.37.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -64,6 +64,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 0-0.37.20140318svn632 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0-0.36.20140318svn632 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 5f7f834f5bb7970220676fffdd9a3c71a2cd6144 Mon Sep 17 00:00:00 2001 From: Tomas Hrnciar Date: Mon, 19 Apr 2021 13:18:32 +0200 Subject: [PATCH 09/30] BuildRequire setuptools explicitly See https://fedoraproject.org/wiki/Changes/Reduce_dependencies_on_python3-setuptools --- yawn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index ef84305..aeb0531 100644 --- a/yawn.spec +++ b/yawn.spec @@ -21,7 +21,7 @@ Patch0: fix-shebang-lines.patch Patch1: python-3-support.patch Patch2: fix-requires.patch -BuildRequires: httpd, python3-devel +BuildRequires: httpd, python3-devel, python3-setuptools Requires: python3-mod_wsgi, python3-pywbem, httpd, python3-werkzeug, python3-mako BuildArch: noarch From 8c07c57154b47f825a87de8ebf73d63aaf6ce155 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:20:29 +0200 Subject: [PATCH 10/30] Rebuilt for Python 3.10 --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index aeb0531..dc9e06a 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.37.%{revdate}svn%{svnrev}%{?dist} +Release: 0.38.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -64,6 +64,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Fri Jun 04 2021 Python Maint - 0-0.38.20140318svn632 +- Rebuilt for Python 3.10 + * Thu Jan 28 2021 Fedora Release Engineering - 0-0.37.20140318svn632 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 3b123d4483d03914cb61b6f0ef756274049528e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:07:16 +0000 Subject: [PATCH 11/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index dc9e06a..6f639cd 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.38.%{revdate}svn%{svnrev}%{?dist} +Release: 0.39.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -64,6 +64,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0-0.39.20140318svn632 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 0-0.38.20140318svn632 - Rebuilt for Python 3.10 From 3888db45c72e3389a3acc493a8084635bc13e3e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:40:43 +0000 Subject: [PATCH 12/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index 6f639cd..0d047f3 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.39.%{revdate}svn%{svnrev}%{?dist} +Release: 0.40.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -64,6 +64,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0-0.40.20140318svn632 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 0-0.39.20140318svn632 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 463cb6d6b98179b707ba23db11bf198afe2bda91 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 15:44:02 +0200 Subject: [PATCH 13/30] Rebuilt for Python 3.11 --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index 0d047f3..add93df 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.40.%{revdate}svn%{svnrev}%{?dist} +Release: 0.41.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -64,6 +64,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Mon Jun 13 2022 Python Maint - 0-0.41.20140318svn632 +- Rebuilt for Python 3.11 + * Sat Jan 22 2022 Fedora Release Engineering - 0-0.40.20140318svn632 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 86735ebab403b295ac4f28fc4cd4c05eb99204cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:43:39 +0000 Subject: [PATCH 14/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index add93df..b68909f 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.41.%{revdate}svn%{svnrev}%{?dist} +Release: 0.42.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -64,6 +64,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0-0.42.20140318svn632 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 0-0.41.20140318svn632 - Rebuilt for Python 3.11 From d3cbc53f74d988cf4fe80c3163e390ef50a685f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:03:49 +0000 Subject: [PATCH 15/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index b68909f..fbb73b1 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.42.%{revdate}svn%{svnrev}%{?dist} +Release: 0.43.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -64,6 +64,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0-0.43.20140318svn632 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 0-0.42.20140318svn632 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 7780a3c8ff65450f860bb7573507773ca2c7162c Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Mon, 5 Jun 2023 09:23:08 +0200 Subject: [PATCH 16/30] SPDX migration, update project URL, replace deprecated patchN Signed-off-by: Vitezslav Crhonek --- yawn.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/yawn.spec b/yawn.spec index fbb73b1..8b31888 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,12 +5,12 @@ Name: yawn Version: 0 -Release: 0.43.%{revdate}svn%{svnrev}%{?dist} +Release: 0.44.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator -License: GPLv2 -URL: https://sourceforge.net/apps/mediawiki/pywbem/index.php?title=YAWN +License: LGPL-2.1-or-later +URL: http://pywbem.github.io/yawn/index.html # The source for this package was pulled from upstream svn repository. # Use the following commands to get the archive: # svn export -r 632 https://svn.code.sf.net/p/pywbem/code/yawn/trunk/mod_wsgi yawn-20140318 @@ -37,9 +37,7 @@ Script to run yawn without Apache web server. %prep %setup -q -n %{name}-%{revdate} -%patch0 -p1 -b .fix-shebang-lines -%patch1 -p1 -b .python-3-support -%patch2 -p1 -b .fix-requires +%autopatch -p1 %build %{__python3} setup.py build @@ -64,6 +62,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Mon Jun 05 2023 Vitezslav Crhonek - 0-0.44.20140318svn632 +- SPDX migration, update project URL + * Sat Jan 21 2023 Fedora Release Engineering - 0-0.43.20140318svn632 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 153baa0bc134ac4541f7233d453797cbe9bb8164 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 21:00:35 +0200 Subject: [PATCH 17/30] Rebuilt for Python 3.12 --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index 8b31888..4c0e82c 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.44.%{revdate}svn%{svnrev}%{?dist} +Release: 0.45.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -62,6 +62,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Tue Jun 13 2023 Python Maint - 0-0.45.20140318svn632 +- Rebuilt for Python 3.12 + * Mon Jun 05 2023 Vitezslav Crhonek - 0-0.44.20140318svn632 - SPDX migration, update project URL From 72e7b89bff9a8df05030c171e6fd98e048458ab9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:29:25 +0000 Subject: [PATCH 18/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index 4c0e82c..97dce74 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.45.%{revdate}svn%{svnrev}%{?dist} +Release: 0.46.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -62,6 +62,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0-0.46.20140318svn632 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 13 2023 Python Maint - 0-0.45.20140318svn632 - Rebuilt for Python 3.12 From 6f71089d65f4d206c67d57016ef66972b4d93be0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 10:44:09 +0000 Subject: [PATCH 19/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index 97dce74..fc55dfb 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.46.%{revdate}svn%{svnrev}%{?dist} +Release: 0.47.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -62,6 +62,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0-0.47.20140318svn632 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0-0.46.20140318svn632 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From eeb739d54ae98b082cce505f348c9dcd8e40b244 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 09:12:45 +0200 Subject: [PATCH 20/30] Rebuilt for Python 3.13 --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index fc55dfb..e6d8a25 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.47.%{revdate}svn%{svnrev}%{?dist} +Release: 0.48.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -62,6 +62,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Fri Jun 07 2024 Python Maint - 0-0.48.20140318svn632 +- Rebuilt for Python 3.13 + * Sat Jan 27 2024 Fedora Release Engineering - 0-0.47.20140318svn632 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 868a547391f82268004b7b28ffd480398050baa7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:40:27 +0000 Subject: [PATCH 21/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index e6d8a25..cc45541 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.48.%{revdate}svn%{svnrev}%{?dist} +Release: 0.49.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -62,6 +62,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0-0.49.20140318svn632 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 0-0.48.20140318svn632 - Rebuilt for Python 3.13 From e74a82c8588711263fac07855548d7b3e6add143 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:32:11 +0000 Subject: [PATCH 22/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index cc45541..3f7aade 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.49.%{revdate}svn%{svnrev}%{?dist} +Release: 0.50.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -62,6 +62,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0-0.50.20140318svn632 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 0-0.49.20140318svn632 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a470f876fb0a758d7dfc7053ef4f9952f66e45d1 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:54:34 +0200 Subject: [PATCH 23/30] Rebuilt for Python 3.14 --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index 3f7aade..1e1431a 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.50.%{revdate}svn%{svnrev}%{?dist} +Release: 0.51.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -62,6 +62,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Mon Jun 02 2025 Python Maint - 0-0.51.20140318svn632 +- Rebuilt for Python 3.14 + * Sun Jan 19 2025 Fedora Release Engineering - 0-0.50.20140318svn632 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From f455fb6293564489cc91015c1758077c7c545b8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:11:28 +0000 Subject: [PATCH 24/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index 1e1431a..9b90d09 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.51.%{revdate}svn%{svnrev}%{?dist} +Release: 0.52.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -62,6 +62,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0-0.52.20140318svn632 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 02 2025 Python Maint - 0-0.51.20140318svn632 - Rebuilt for Python 3.14 From 0b3e98ca641f6b8e6fb8f6086a94f772a1ae9930 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:23:32 +0200 Subject: [PATCH 25/30] Rebuilt for Python 3.14.0rc2 bytecode --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index 9b90d09..e06c816 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.52.%{revdate}svn%{svnrev}%{?dist} +Release: 0.53.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -62,6 +62,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Fri Aug 15 2025 Python Maint - 0-0.53.20140318svn632 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 0-0.52.20140318svn632 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 959e3dbab90557e2affc8beda6f53f89c7a35671 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Wed, 27 Aug 2025 09:34:53 +0200 Subject: [PATCH 26/30] Stop using deprecated python setup.py --- yawn.spec | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/yawn.spec b/yawn.spec index e06c816..4f513cf 100644 --- a/yawn.spec +++ b/yawn.spec @@ -2,10 +2,11 @@ %global apacheconfdir /etc/httpd %global svnrev 632 %global revdate 20140318 +%global ver 0.1.7 Name: yawn Version: 0 -Release: 0.53.%{revdate}svn%{svnrev}%{?dist} +Release: 0.54.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -21,7 +22,7 @@ Patch0: fix-shebang-lines.patch Patch1: python-3-support.patch Patch2: fix-requires.patch -BuildRequires: httpd, python3-devel, python3-setuptools +BuildRequires: httpd, python3-devel Requires: python3-mod_wsgi, python3-pywbem, httpd, python3-werkzeug, python3-mako BuildArch: noarch @@ -39,11 +40,14 @@ Script to run yawn without Apache web server. %setup -q -n %{name}-%{revdate} %autopatch -p1 +%generate_buildrequires +%pyproject_buildrequires + %build -%{__python3} setup.py build +%pyproject_wheel %install -%{__python3} setup.py install --skip-build --root ${RPM_BUILD_ROOT} +%pyproject_install mkdir -p $RPM_BUILD_ROOT%{htmldir} install ./scripts/yawn.wsgi $RPM_BUILD_ROOT%{htmldir}/index.wsgi install -d $RPM_BUILD_ROOT%{apacheconfdir}/conf.d/ @@ -54,7 +58,8 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %files %{htmldir} -%{python3_sitelib}/* +%{python3_sitelib}/pywbem_yawn/ +%{python3_sitelib}/yawn-%{ver}.dist-info/ %config(noreplace) %{apacheconfdir}/conf.d/yawn.conf %doc README Changelog @@ -62,6 +67,10 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Wed Aug 27 2025 Vitezslav Crhonek - 0-0.54.20140318svn632 +- Stop using deprecated python setup.py build/install command in the spec + Resolves: #2378639 + * Fri Aug 15 2025 Python Maint - 0-0.53.20140318svn632 - Rebuilt for Python 3.14.0rc2 bytecode From bb930505dc315c762fdc20a78992b720e3d5969c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:04:03 +0200 Subject: [PATCH 27/30] Rebuilt for Python 3.14.0rc3 bytecode --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index 4f513cf..bb1a0da 100644 --- a/yawn.spec +++ b/yawn.spec @@ -6,7 +6,7 @@ Name: yawn Version: 0 -Release: 0.54.%{revdate}svn%{svnrev}%{?dist} +Release: 0.55.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -67,6 +67,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Fri Sep 19 2025 Python Maint - 0-0.55.20140318svn632 +- Rebuilt for Python 3.14.0rc3 bytecode + * Wed Aug 27 2025 Vitezslav Crhonek - 0-0.54.20140318svn632 - Stop using deprecated python setup.py build/install command in the spec Resolves: #2378639 From 8830811b0e24c1e9fefe41f98b874ad72bfa11fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:01:21 +0000 Subject: [PATCH 28/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index bb1a0da..a3762fb 100644 --- a/yawn.spec +++ b/yawn.spec @@ -6,7 +6,7 @@ Name: yawn Version: 0 -Release: 0.55.%{revdate}svn%{svnrev}%{?dist} +Release: 0.56.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -67,6 +67,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0-0.56.20140318svn632 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Sep 19 2025 Python Maint - 0-0.55.20140318svn632 - Rebuilt for Python 3.14.0rc3 bytecode From 6f5030284fac2706fcb72fa7be1ff978dd580207 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 4 Jun 2026 09:33:24 +0200 Subject: [PATCH 29/30] Rebuilt for Python 3.15 --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index a3762fb..976263f 100644 --- a/yawn.spec +++ b/yawn.spec @@ -6,7 +6,7 @@ Name: yawn Version: 0 -Release: 0.56.%{revdate}svn%{svnrev}%{?dist} +Release: 0.57.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -67,6 +67,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Thu Jun 04 2026 Python Maint - 0-0.57.20140318svn632 +- Rebuilt for Python 3.15 + * Sat Jan 17 2026 Fedora Release Engineering - 0-0.56.20140318svn632 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 5fc2f19fcef0d4ac7cff2b9f0528b0ef2dd8b5e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:33:47 +0000 Subject: [PATCH 30/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- yawn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yawn.spec b/yawn.spec index 976263f..07d4c34 100644 --- a/yawn.spec +++ b/yawn.spec @@ -6,7 +6,7 @@ Name: yawn Version: 0 -Release: 0.57.%{revdate}svn%{svnrev}%{?dist} +Release: 0.58.%{revdate}svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -67,6 +67,9 @@ install -m 0644 ./apache/yawn.conf ${RPM_BUILD_ROOT}/%{apacheconfdir}/conf.d/yaw %{_bindir}/yawn.py %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0-0.58.20140318svn632 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Thu Jun 04 2026 Python Maint - 0-0.57.20140318svn632 - Rebuilt for Python 3.15