Version 5.8.9

... (rhbz#2228541)

(cherry picked from commit 2627580a2c)

PyMca.spec

@@ -1,8 +1,8 @@
 Name:           PyMca
-Version:        5.9.4
+Version:        5.8.9
 Release:        %autorelease
 Summary:        X-ray Fluorescence Toolkit
-License:        GPL-2.0-or-later
+License:        GPLv2+
 URL:            http://pymca.sourceforge.net/
 #  https://github.com/vasole/pymca
 %if 0
@@ -61,7 +61,8 @@ This package contains photon interaction data/elements data for %{name}.
 %prep
 %autosetup -p1 -n pymca-%{version}
 
-sed -r -i 's|(os.path.join.")(PyMca5")|\1src/\2|' setup.py
+# Fix wrong shebang of pymcapostbatch.
+sed -i "s|!python|!%python3|g" PyMca5/scripts/pymcapostbatch
 
 %build
 # Need to define manually. Note using pkg-config to export the cflags
@@ -79,8 +80,6 @@ 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}
@@ -194,7 +193,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 src/PyMca5/tests/TestAll.py
+%python3 PyMca5/tests/TestAll.py
 
 # Test results are ingored. In F34 rawhide mock:
 # ERROR: testHdf5Uri (ConfigDictTest.testConfigDict)

changelog

@@ -1,93 +1,3 @@
-* Sat Jun 08 2024 Python Maint <python-maint@redhat.com> - 5.9.2-4
-- Rebuilt for Python 3.13
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Dec 17 2023 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.9.2-1
-- Version 5.9.2 (rhbz#2252290)
-
-* Tue Nov 21 2023 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.9.1-2
-- Convert license tag to SPDX
-
-* Thu Sep 28 2023 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.9.1-1
-- Version 5.9.1 (rhbz#2240987)
-
-* Sat Sep 02 2023 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.9.0-1
-- Version 5.9.0 (rhbz#2233556)
-
-* Sun Aug 06 2023 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.8.9-1
-- Version 5.8.9 (rhbz#2228541)
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sun Jul 16 2023 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.8.7-1
-- Version 5.8.7 (rhbz#2213795)
-
-* Wed Jul 12 2023 Python Maint <python-maint@redhat.com> - 5.8.2-2
-- Rebuilt for Python 3.12
-
-* Sat May 20 2023 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.8.2-1
-- Version 5.8.2 (rhbz#2207560)
-
-* Tue Feb 21 2023 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.8.1-1
-- Version 5.8.1 (rhbz#2143705)
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sun Nov 27 2022 Florian Weimer <fweimer@redhat.com> - 5.7.5-2
-- Fix a C99 compatibility issue
-
-* Tue Aug 23 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.7.5-1
-- Version 5.7.5 (rhbz#2119849)
-
-* Tue Aug 16 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.7.4-1
-- Version 5.7.4 (rhbz#2113982)
-
-* Mon Jul 25 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.7.3-1
-- Version 5.7.3 (rhbz#2109982)
-
-* Fri Jul 22 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.7.2-2
-- Add patch to skip failing tests (rhbz#2098667)
-
-* Fri Jul 22 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.7.2-1
-- Version 5.7.2
-
-* Fri Jul 22 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.6.7-9
-- Modernize macros
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.7-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jun 15 2022 Python Maint <python-maint@redhat.com> - 5.6.7-7
-- Rebuilt for Python 3.11
-
-* Mon May 16 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.6.7-6
-- Fix mixup between Requires and BuildRequires (#2084297)
-
-* Thu May 12 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.6.7-5
-- Tweak requires
-
-* Thu May 12 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.6.7-4
-- Add explicit dependency on PyQt5 (rhbz#2084297)
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Dec 01 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.6.7-2
-- Adjust dependencies and environment so that tests pass
-
-* Wed Dec 01 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.6.7-1
-- Version 5.6.7 (#2027722)
-
-* Wed Sep 29 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.6.5-1
-- Version 5.6.5 (#1763697)
-
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (pymca-5.9.4-filtered.tar.xz) = 08304ccfda672aa7fe9075eb72a17d5a12c72924c15546c0706435970d754e8dcf75870bdac99509a52d539e5f6d8cc42131bae823d9c0cbda688e4b5dfa39f4
+SHA512 (pymca-5.8.9-filtered.tar.xz) = 3e78b413e22e45eacdfd57727a6613e7a7c9f63fed9637690ed6235d8af43a5384d6e402456cada63d1602e9d32c913f5f8b0af572ef3937b810c108e058a981