From 53323acea304fc415906d33933ead26967825b2b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 20:58:05 +0200 Subject: [PATCH 01/11] Rebuilt for Python 3.13 From 94fd9cfd0db00cddf07abc2e4599c9e5cc4d9f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 4 Jul 2024 14:39:15 +0200 Subject: [PATCH 02/11] Fix bogus changelog entry --- changelog | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/changelog b/changelog index 9bd2c0d..9c3d896 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,93 @@ +* Sat Jun 08 2024 Python Maint - 5.9.2-4 +- Rebuilt for Python 3.13 + +* Mon Jan 22 2024 Fedora Release Engineering - 5.9.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 5.9.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Dec 17 2023 Zbigniew Jędrzejewski-Szmek - 5.9.2-1 +- Version 5.9.2 (rhbz#2252290) + +* Tue Nov 21 2023 Zbigniew Jędrzejewski-Szmek - 5.9.1-2 +- Convert license tag to SPDX + +* Thu Sep 28 2023 Zbigniew Jędrzejewski-Szmek - 5.9.1-1 +- Version 5.9.1 (rhbz#2240987) + +* Sat Sep 02 2023 Zbigniew Jędrzejewski-Szmek - 5.9.0-1 +- Version 5.9.0 (rhbz#2233556) + +* Sun Aug 06 2023 Zbigniew Jędrzejewski-Szmek - 5.8.9-1 +- Version 5.8.9 (rhbz#2228541) + +* Wed Jul 19 2023 Fedora Release Engineering - 5.8.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sun Jul 16 2023 Zbigniew Jędrzejewski-Szmek - 5.8.7-1 +- Version 5.8.7 (rhbz#2213795) + +* Wed Jul 12 2023 Python Maint - 5.8.2-2 +- Rebuilt for Python 3.12 + +* Sat May 20 2023 Zbigniew Jędrzejewski-Szmek - 5.8.2-1 +- Version 5.8.2 (rhbz#2207560) + +* Tue Feb 21 2023 Zbigniew Jędrzejewski-Szmek - 5.8.1-1 +- Version 5.8.1 (rhbz#2143705) + +* Wed Jan 18 2023 Fedora Release Engineering - 5.7.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sun Nov 27 2022 Florian Weimer - 5.7.5-2 +- Fix a C99 compatibility issue + +* Tue Aug 23 2022 Zbigniew Jędrzejewski-Szmek - 5.7.5-1 +- Version 5.7.5 (rhbz#2119849) + +* Tue Aug 16 2022 Zbigniew Jędrzejewski-Szmek - 5.7.4-1 +- Version 5.7.4 (rhbz#2113982) + +* Mon Jul 25 2022 Zbigniew Jędrzejewski-Szmek - 5.7.3-1 +- Version 5.7.3 (rhbz#2109982) + +* Fri Jul 22 2022 Zbigniew Jędrzejewski-Szmek - 5.7.2-2 +- Add patch to skip failing tests (rhbz#2098667) + +* Fri Jul 22 2022 Zbigniew Jędrzejewski-Szmek - 5.7.2-1 +- Version 5.7.2 + +* Fri Jul 22 2022 Zbigniew Jędrzejewski-Szmek - 5.6.7-9 +- Modernize macros + +* Wed Jul 20 2022 Fedora Release Engineering - 5.6.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jun 15 2022 Python Maint - 5.6.7-7 +- Rebuilt for Python 3.11 + +* Mon May 16 2022 Zbigniew Jędrzejewski-Szmek - 5.6.7-6 +- Fix mixup between Requires and BuildRequires (#2084297) + +* Thu May 12 2022 Zbigniew Jędrzejewski-Szmek - 5.6.7-5 +- Tweak requires + +* Thu May 12 2022 Zbigniew Jędrzejewski-Szmek - 5.6.7-4 +- Add explicit dependency on PyQt5 (rhbz#2084297) + +* Wed Jan 19 2022 Fedora Release Engineering - 5.6.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Dec 01 2021 Zbigniew Jędrzejewski-Szmek - 5.6.7-2 +- Adjust dependencies and environment so that tests pass + +* Wed Dec 01 2021 Zbigniew Jędrzejewski-Szmek - 5.6.7-1 +- Version 5.6.7 (#2027722) + +* Wed Sep 29 2021 Zbigniew Jędrzejewski-Szmek - 5.6.5-1 +- Version 5.6.5 (#1763697) + * Wed Jul 21 2021 Fedora Release Engineering - 5.5.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From f254679a023e449985e66c3930bfa23e309fe6e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 6 Jul 2024 19:45:09 +0200 Subject: [PATCH 03/11] Version 5.9.3 ... (rhbz#2295553) --- PyMca.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index 22cd87f..5609e04 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,5 +1,5 @@ Name: PyMca -Version: 5.9.2 +Version: 5.9.3 Release: %autorelease Summary: X-ray Fluorescence Toolkit License: GPL-2.0-or-later diff --git a/sources b/sources index 518528a..a3e17fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pymca-5.9.2-filtered.tar.xz) = a33684ca3a43985e34acf79d2db289ac41c2b59dc965ff88135b4a14440ebf7e073c61e5701e6b1380586290ed0eed33d1ab132f0a5148ad1558f8a45eb7516a +SHA512 (pymca-5.9.3-filtered.tar.xz) = 5dc298a47a5e6591f805c4e892fe1c175b3e76b6591217b405acf92ebbce5107c6a69da7ac0d3039ad963b1adce1d421893efcf9b0c783c140a32c09e61156f3 From 78357d26464ca432b76dcd2c1e273ffe2e34c5c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 15:08:05 +0000 Subject: [PATCH 04/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 41b5084498734f2bd4a9e66f8962bc05a8c2d071 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 20 Dec 2024 22:12:05 -0700 Subject: [PATCH 05/11] Rebuild with numpy 2.2 (rhbz#2333356) From 949d8445257e870d35b83310b9ca16cdb3466a93 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 08:53:51 +0000 Subject: [PATCH 06/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ece44cc2eda21cbcb097a2fc44c0ef3797ba270d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 2 Mar 2025 13:50:46 +0100 Subject: [PATCH 07/11] Version 5.9.4 ... (rhbz#2338270) --- PyMca.spec | 9 +++++---- sources | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index 5609e04..50d2f1a 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,5 +1,5 @@ Name: PyMca -Version: 5.9.3 +Version: 5.9.4 Release: %autorelease Summary: X-ray Fluorescence Toolkit License: GPL-2.0-or-later @@ -61,8 +61,7 @@ This package contains photon interaction data/elements data for %{name}. %prep %autosetup -p1 -n pymca-%{version} -# Fix wrong shebang of pymcapostbatch. -sed -i "s|!python|!%python3|g" PyMca5/scripts/pymcapostbatch +sed -r -i 's|(os.path.join.")(PyMca5")|\1src/\2|' setup.py %build # Need to define manually. Note using pkg-config to export the cflags @@ -80,6 +79,8 @@ PYMCA_DATA_DIR=/usr/share/PyMca \ PYMCA_DOC_DIR=/usr/share/doc/PyMca \ %py3_install +cp -ap src/PyMca5/PyMcaData/attdata/* %{buildroot}%{_datadir}/PyMca/attdata/ + # Install desktop file. desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:1} desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:2} @@ -193,7 +194,7 @@ PYMCA_DATA_DIR=%{buildroot}/usr/share/PyMca \ PYMCA_DOC_DIR=%{buildroot}/usr/share/doc/PyMca \ QT_QPA_PLATFORM=offscreen \ LC_ALL=pl_PL.utf8 \ -%python3 PyMca5/tests/TestAll.py +%python3 src/PyMca5/tests/TestAll.py # Test results are ingored. In F34 rawhide mock: # ERROR: testHdf5Uri (ConfigDictTest.testConfigDict) diff --git a/sources b/sources index a3e17fc..81ef8da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pymca-5.9.3-filtered.tar.xz) = 5dc298a47a5e6591f805c4e892fe1c175b3e76b6591217b405acf92ebbce5107c6a69da7ac0d3039ad963b1adce1d421893efcf9b0c783c140a32c09e61156f3 +SHA512 (pymca-5.9.4-filtered.tar.xz) = 08304ccfda672aa7fe9075eb72a17d5a12c72924c15546c0706435970d754e8dcf75870bdac99509a52d539e5f6d8cc42131bae823d9c0cbda688e4b5dfa39f4 From 5fd2aee5f117dec3673fc4c8f71ac0f017c36c16 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 20:10:42 +0200 Subject: [PATCH 08/11] Rebuilt for Python 3.14 From c6846466f8b942a8f3b042e6b28a414776325126 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 15:56:00 +0000 Subject: [PATCH 09/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 778704d8cdb2b68b2fff8c06572fba21731f3ed3 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 13:08:56 +0200 Subject: [PATCH 10/11] Rebuilt for Python 3.14.0rc2 bytecode From 008c8782d3532b22206a911b8c905d0a5aa221cf Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:39:43 +0200 Subject: [PATCH 11/11] Rebuilt for Python 3.14.0rc3 bytecode