Rebuilt for Python 3.14.0rc3 bytecode

... (rhbz#2338270)

PyMca.spec

@@ -1,16 +1,17 @@
 Name:           PyMca
-Version:        5.6.7
+Version:        5.9.4
 Release:        %autorelease
 Summary:        X-ray Fluorescence Toolkit
-License:        GPLv2+
+License:        GPL-2.0-or-later
 URL:            http://pymca.sourceforge.net/
+#  https://github.com/vasole/pymca
 %if 0
 Original source: http://downloads.sourceforge.net/sourceforge/pymca/pymca%%{version}-src.tgz
 However it bundles a copy of the "sift" module which implements a patented algorithm.
 The algorithm can be used for non-commercial research purposes ONLY. Per:
 http://fedoraproject.org/wiki/Packaging:SourceURL#When_Upstream_uses_Prohibited_Code
 we must remove them before uploading:
-  ./getsources.sh %{version}
+  ./getsources.sh [%{version}]
 %endif
 Source0:        pymca-%{version}-filtered.tar.xz
 Source1:        PyMca.desktop
@@ -21,17 +22,18 @@ Source5:        peakidentifier.desktop
 Source6:        pymcabatch.desktop
 Source7:        pymcapostbatch.desktop
 Source8:        pymcaroitool.desktop
+
 BuildRequires:  gcc
 BuildRequires:  desktop-file-utils
 BuildRequires:  ImageMagick
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
-BuildRequires:  %py3_dist cython
-BuildRequires:  %py3_dist numpy
-BuildRequires:  %py3_dist h5py
-BuildRequires:  %py3_dist pyqt5
-BuildRequires:  %py3_dist fisx
-BuildRequires:  %py3_dist matplotlib
+BuildRequires:  python3dist(cython)
+BuildRequires:  python3dist(numpy)
+BuildRequires:  python3dist(h5py)
+BuildRequires:  python3dist(pyqt5)
+BuildRequires:  python3dist(fisx)
+BuildRequires:  python3dist(matplotlib)
 BuildRequires:  python3-matplotlib-qt5
 BuildRequires:  mesa-libGL-devel
 BuildRequires:  mesa-libGLU-devel
@@ -39,6 +41,10 @@ BuildRequires:  qhull-devel
 BuildRequires:  glibc-langpack-pl
 Requires:       hicolor-icon-theme
 Requires:       %{name}-data = %{version}-%{release}
+# Dependency on the graphical toolkit is not autogenerated because many different
+# ones are supported, https://bugzilla.redhat.com/show_bug.cgi?id=2084297.
+Requires:       python3dist(pyqt5)
+Requires:       python3-matplotlib-qt5
 
 %description
 PyMCA provides a graphical interface for multi-channel analyzer spectra
@@ -55,20 +61,7 @@ This package contains photon interaction data/elements data for %{name}.
 %prep
 %autosetup -p1 -n pymca-%{version}
 
-# Drop bundled qhull.
-rm -frv third-party/
-# Patch for the craps qhull brings in.
-sed -i -e 's|"geom.h"|<geom.h>|'      \
-       -e 's|"libqhull.h"|<libqhull.h>|' \
-       -e 's|"poly.h"|<poly.h>|'      \
-       -e 's|"qset.h"|<qset.h>|'      \
-       PyMca5/Object3D/Object3DQhull/Object3DQhull.c
-
-# Fix wrong shebang of pymcapostbatch.
-sed -i "s|!python|!%{__python3}|g" PyMca5/scripts/pymcapostbatch
-
-# grep -rE $'(^\\s*if.*)is(\\s+not)?(\\s+[\'"0-9])' . | \
-#   xargs sed -r -i $'s/(^\\s*if.*)is(\\s+not)?(\\s+[\'"0-9])/\1==\2/'
+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
@@ -86,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}
@@ -97,8 +92,8 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:7}
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:8}
 
 # Merge applications into one software center item
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/edfviewer.appdata.xml <<EOF
+mkdir -p %{buildroot}%{_datadir}/appdata
+cat >%{buildroot}%{_datadir}/appdata/edfviewer.appdata.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
 <component type="desktop">
@@ -109,7 +104,7 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/edfviewer.appdata.xml <<EOF
   </metadata>
 </component>
 EOF
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/elementsinfo.appdata.xml <<EOF
+cat >%{buildroot}%{_datadir}/appdata/elementsinfo.appdata.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
 <component type="desktop">
@@ -120,7 +115,7 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/elementsinfo.appdata.xml <<EOF
   </metadata>
 </component>
 EOF
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/mca2edf.appdata.xml <<EOF
+cat >%{buildroot}%{_datadir}/appdata/mca2edf.appdata.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
 <component type="desktop">
@@ -131,7 +126,7 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/mca2edf.appdata.xml <<EOF
   </metadata>
 </component>
 EOF
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/peakidentifier.appdata.xml <<EOF
+cat >%{buildroot}%{_datadir}/appdata/peakidentifier.appdata.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
 <component type="desktop">
@@ -142,7 +137,7 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/peakidentifier.appdata.xml <<EOF
   </metadata>
 </component>
 EOF
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/pymcabatch.appdata.xml <<EOF
+cat >%{buildroot}%{_datadir}/appdata/pymcabatch.appdata.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
 <component type="desktop">
@@ -153,7 +148,7 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/pymcabatch.appdata.xml <<EOF
   </metadata>
 </component>
 EOF
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/pymcapostbatch.appdata.xml <<EOF
+cat >%{buildroot}%{_datadir}/appdata/pymcapostbatch.appdata.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
 <component type="desktop">
@@ -164,7 +159,7 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/pymcapostbatch.appdata.xml <<EOF
   </metadata>
 </component>
 EOF
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/pymcaroitool.appdata.xml <<EOF
+cat >%{buildroot}%{_datadir}/appdata/pymcaroitool.appdata.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
 <component type="desktop">
@@ -199,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)

changelog

@@ -1,3 +1,93 @@
+* 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.6.7-filtered.tar.xz) = 565b0524c5b56ed8d74f7f52b7b6aefa58770043786fdcee55e24c971901ab5f56f60b3bc54f63f2b059a8f7a95d22161d8f587361125dd55bf78b91d7c6cd2b
+SHA512 (pymca-5.9.4-filtered.tar.xz) = 08304ccfda672aa7fe9075eb72a17d5a12c72924c15546c0706435970d754e8dcf75870bdac99509a52d539e5f6d8cc42131bae823d9c0cbda688e4b5dfa39f4