From 41b5084498734f2bd4a9e66f8962bc05a8c2d071 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 20 Dec 2024 22:12:05 -0700 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] Rebuilt for Python 3.14.0rc3 bytecode