From 7e2cba92828e5071f6c58eab97a6656c08acccac Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 09:14:38 -0500 Subject: [PATCH 01/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 01c2826..7ef8ac4 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -7,7 +7,7 @@ Name: PyMca Version: 4.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI for multi-channel analyser spectra visualization and analysis Group: Applications/Engineering License: GPLv2+ @@ -95,6 +95,9 @@ rm -rf %{buildroot} %{_datadir}/applications/PyMca.desktop %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 4.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Mar 24 2012 Jussi Lehtola - 4.5.0-1 - Update to 4.5.0. From ec9d0ec3e09eba06bfc8127fb962190673ad07c2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 09:32:50 -0600 Subject: [PATCH 02/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 7ef8ac4..ab12cb7 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -7,7 +7,7 @@ Name: PyMca Version: 4.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUI for multi-channel analyser spectra visualization and analysis Group: Applications/Engineering License: GPLv2+ @@ -95,6 +95,9 @@ rm -rf %{buildroot} %{_datadir}/applications/PyMca.desktop %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 4.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Jul 18 2012 Fedora Release Engineering - 4.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 8945c00ab8e4426fd116ce2c01650dc90b073b9c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 18:11:33 -0500 Subject: [PATCH 03/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index ab12cb7..f8f61a3 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -7,7 +7,7 @@ Name: PyMca Version: 4.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GUI for multi-channel analyser spectra visualization and analysis Group: Applications/Engineering License: GPLv2+ @@ -95,6 +95,9 @@ rm -rf %{buildroot} %{_datadir}/applications/PyMca.desktop %changelog +* Fri Aug 02 2013 Fedora Release Engineering - 4.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 4.5.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From a30a7598bd5821aa90ef63c4751c1f5e6dbf92e7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 18:04:46 -0500 Subject: [PATCH 04/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index f8f61a3..e49f060 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -7,7 +7,7 @@ Name: PyMca Version: 4.5.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GUI for multi-channel analyser spectra visualization and analysis Group: Applications/Engineering License: GPLv2+ @@ -95,6 +95,9 @@ rm -rf %{buildroot} %{_datadir}/applications/PyMca.desktop %changelog +* Fri Jun 06 2014 Fedora Release Engineering - 4.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Aug 02 2013 Fedora Release Engineering - 4.5.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 295d5f2b0e56fb10ec199587185c7b2453ec34f1 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 18 Jun 2014 23:35:12 -0500 Subject: [PATCH 05/80] Fix FTBFS with -Werror=format-security (#1105919) --- PyMca-4.5.0-format-security.patch | 13 +++++++++++++ PyMca.spec | 14 +++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 PyMca-4.5.0-format-security.patch diff --git a/PyMca-4.5.0-format-security.patch b/PyMca-4.5.0-format-security.patch new file mode 100644 index 0000000..b5241b7 --- /dev/null +++ b/PyMca-4.5.0-format-security.patch @@ -0,0 +1,13 @@ +diff --git a/PyMca/Object3D/Object3DQhull/src/io.c b/PyMca/Object3D/Object3DQhull/src/io.c +index c219100..38d301d 100755 +--- a/PyMca/Object3D/Object3DQhull/src/io.c ++++ b/PyMca/Object3D/Object3DQhull/src/io.c +@@ -2166,7 +2166,7 @@ void qh_printfacet3math (FILE *fp, facetT *facet, int format, int notfirst) { + qh_memfree (point, qh normal_size); + qh_settempfree(&points); + qh_settempfree(&vertices); +- fprintf(fp, endfmt); ++ fprintf(fp, "%s", endfmt); + } /* printfacet3math */ + + diff --git a/PyMca.spec b/PyMca.spec index e49f060..22b45e4 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -7,7 +7,7 @@ Name: PyMca Version: 4.5.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GUI for multi-channel analyser spectra visualization and analysis Group: Applications/Engineering License: GPLv2+ @@ -15,7 +15,7 @@ URL: http://pymca.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/pymca/pymca%{version}-src.tgz # Desktop file Source1: PyMca.desktop -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: PyMca-4.5.0-format-security.patch BuildRequires: desktop-file-utils BuildRequires: python-devel @@ -38,6 +38,7 @@ from SPEC during acquisitions. %prep %setup -q -n %{name}%{version} +%patch0 -p1 # Fix perms chmod 644 LICENSE.GPL README find -name *.c -exec chmod 644 {} \; @@ -52,7 +53,6 @@ sed "s|#!python|#!%{_bindir}/python|g" -i PyMca/scripts/pymcapostbatch echo yes | python setup.py build %install -rm -rf %{buildroot} # setup.py asks for license approval echo yes | python setup.py install -O1 --skip-build --root %{buildroot} @@ -78,11 +78,7 @@ for lib in %{buildroot}%{python_sitearch}/PyMca/*.py; do mv $lib.new $lib done -%clean -rm -rf %{buildroot} - %files -%defattr(-,root,root,-) %doc LICENSE.GPL README %{python_sitearch}/PyMca/ %{python_sitearch}/PyMca-%{version}-py*.egg-info @@ -95,6 +91,10 @@ rm -rf %{buildroot} %{_datadir}/applications/PyMca.desktop %changelog +* Wed Jun 18 2014 Yaakov Selkowitz - 4.5.0-6 +- Fix FTBFS with -Werror=format-security (#1105919) +- Cleanup spec + * Fri Jun 06 2014 Fedora Release Engineering - 4.5.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From cd87d59f19d24cc8a5f2baedd8cc2410c27f3837 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Wed, 9 Jul 2014 18:51:38 +0800 Subject: [PATCH 06/80] Update to 4.7.3 Convert icons to proper sizes for display Add Icon entry in the desktop file | "-" --- PyMca.desktop | 1 + PyMca.spec | 122 +++++++++++++++++++++++++------------------------- 2 files changed, 62 insertions(+), 61 deletions(-) diff --git a/PyMca.desktop b/PyMca.desktop index 493c7c6..976b334 100644 --- a/PyMca.desktop +++ b/PyMca.desktop @@ -3,6 +3,7 @@ Encoding=UTF-8 Name=PyMca Comment=A collection of Python tools for visualization and analysis of energy-dispersive X-ray fluorescence data Exec=pymca +Icon=PyMca Terminal=false Type=Application Categories=Education;Science;DataVisualization;Physics; diff --git a/PyMca.spec b/PyMca.spec index 22b45e4..5dd932b 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,35 +1,25 @@ -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -%{?filter_setup: -%filter_provides_in %{python_sitearch}.*\.so$ -%filter_setup -} - -Name: PyMca -Version: 4.5.0 -Release: 6%{?dist} -Summary: GUI for multi-channel analyser spectra visualization and analysis -Group: Applications/Engineering -License: GPLv2+ -URL: http://pymca.sourceforge.net/ -Source0: http://downloads.sourceforge.net/sourceforge/pymca/pymca%{version}-src.tgz -# Desktop file -Source1: PyMca.desktop -Patch0: PyMca-4.5.0-format-security.patch - -BuildRequires: desktop-file-utils -BuildRequires: python-devel -BuildRequires: python-setuptools -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel - -# Needed for normal operations -BuildRequires: numpy -BuildRequires: PyQt4 -BuildRequires: PyQwt -Requires: numpy -Requires: PyQt4 -Requires: PyQwt +Name: PyMca +Version: 4.7.3 +Release: 1%{?dist} +Summary: PyMca X-ray Fluorescence Toolkit +License: GPLv2+ +URL: http://pymca.sourceforge.net/ +Source0: http://downloads.sourceforge.net/sourceforge/pymca/pymca%{version}-src.tgz +Source1: PyMca.desktop +BuildRequires: desktop-file-utils +BuildRequires: ImageMagick +BuildRequires: python2-devel +BuildRequires: python-setuptools +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel +BuildRequires: numpy +BuildRequires: PyQt4 +BuildRequires: PyQwt +BuildRequires: qhull-devel +Requires: hicolor-icon-theme +Requires: numpy +Requires: PyQt4 +Requires: PyQwt %description PyMCA provides a graphical interface for multi-channel analyser spectra @@ -37,51 +27,54 @@ visualization and analysis. PyMca can display spectra from a file or directly from SPEC during acquisitions. %prep -%setup -q -n %{name}%{version} -%patch0 -p1 -# Fix perms -chmod 644 LICENSE.GPL README -find -name *.c -exec chmod 644 {} \; -find -name *.h -exec chmod 644 {} \; - -# Fix shebang on pymcapostbatch -sed "s|#!python|#!%{_bindir}/python|g" -i PyMca/scripts/pymcapostbatch +%setup -q +rm -frv third-party/ +# Fix wrong shebang of pymcapostbatch. +sed -i "s|!python|!%{__python2}|g" PyMca/scripts/pymcapostbatch %build -# setup.py asks for license approval -echo yes | python setup.py build +%{__python2} setup.py build %install -# setup.py asks for license approval -echo yes | python setup.py install -O1 --skip-build --root %{buildroot} +%{__python2} setup.py install -O1 --skip-build --root %{buildroot} -# Install desktop file -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} +# Install desktop file. +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:1} -# Get rid of mention of buildroot in files in %{_bindir} -for bin in %{buildroot}%{_bindir}/*; do - sed 's|%{buildroot}||g' $bin > $bin.new && \ - touch -r $bin $bin.new && \ - mv $bin.new $bin && \ - chmod 755 $bin +# Convert to various sizes, via the 256x256 source. +for size in 192x192 128x128 96x96 72x72 64x64 48x48 40x40 36x36 32x32 26x26 24x24 22x22 16x16 ; do + install -pdm755 \ + %{buildroot}%{_datadir}/icons/hicolor/${size}/apps + convert -resize ${size} icons/PyMca_256x256.png \ + %{buildroot}%{_datadir}/icons/hicolor/${size}/apps/%{name}.png done -# Get rid of spurious executable rights -find %{buildroot}%{python_sitearch}/PyMca/ -type f -exec chmod 644 {} \; -find %{buildroot}%{python_sitearch}/PyMca/ -name *.so -exec chmod 755 {} \; +# Get rid of spurious executable rights. +find %{buildroot}%{python2_sitearch}/PyMca/ -type f -exec chmod 644 {} \; +find %{buildroot}%{python2_sitearch}/PyMca/ -name *.so -exec chmod 755 {} \; -# Get rid of /usr/bin/env in libraries -for lib in %{buildroot}%{python_sitearch}/PyMca/*.py; do +# Get rid of /usr/bin/env in libraries. +for lib in %{buildroot}%{python2_sitearch}/PyMca/*.py; do sed '/\/usr\/bin\/env/d' $lib > $lib.new && touch -r $lib $lib.new && mv $lib.new $lib done +%post +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %files -%doc LICENSE.GPL README -%{python_sitearch}/PyMca/ -%{python_sitearch}/PyMca-%{version}-py*.egg-info +%doc changelog.txt LICENSE.GPL README %{_bindir}/edfviewer %{_bindir}/elementsinfo %{_bindir}/mca2edf @@ -89,8 +82,15 @@ done %{_bindir}/pymca* %{_bindir}/rgbcorrelator %{_datadir}/applications/PyMca.desktop +%{_datadir}/icons/hicolor/*x*/apps/%{name}.png +%{_mandir}/man1/*.1* +%{python2_sitearch}/PyMca/ +%{python2_sitearch}/PyMca-%{version}-py%{python2_version}.egg-info %changelog +* Fri Jul 04 2014 Christopher Meng - 4.7.3-1 +- Update to 4.7.3 + * Wed Jun 18 2014 Yaakov Selkowitz - 4.5.0-6 - Fix FTBFS with -Werror=format-security (#1105919) - Cleanup spec From e3ec114440a8ffc32e4678171536d8fd345ca9b2 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Sat, 2 Aug 2014 16:14:29 +0800 Subject: [PATCH 07/80] Update to 4.7.3 --- .gitignore | 1 + ...yMca-4.7.3-set-Fedora-specific-paths.patch | 27 ++++ PyMca-4.5.0-format-security.patch | 13 -- PyMca.desktop | 2 +- PyMca.spec | 117 +++++++++++++++++- edfviewer.desktop | 10 ++ elementsinfo.desktop | 10 ++ mca2edf.desktop | 10 ++ peakidentifier.desktop | 10 ++ pymcabatch.desktop | 10 ++ pymcapostbatch.desktop | 10 ++ pymcaroitool.desktop | 10 ++ sources | 2 +- 13 files changed, 211 insertions(+), 21 deletions(-) create mode 100644 0001-PyMca-4.7.3-set-Fedora-specific-paths.patch delete mode 100644 PyMca-4.5.0-format-security.patch create mode 100644 edfviewer.desktop create mode 100644 elementsinfo.desktop create mode 100644 mca2edf.desktop create mode 100644 peakidentifier.desktop create mode 100644 pymcabatch.desktop create mode 100644 pymcapostbatch.desktop create mode 100644 pymcaroitool.desktop diff --git a/.gitignore b/.gitignore index d0e2141..9da8272 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ pymca4.4.0-src.tgz /pymca4.4.1-src.tgz /pymca4.4.1p1-src.tgz /pymca4.5.0-src.tgz +/pymca4.7.3-src-clean.tgz diff --git a/0001-PyMca-4.7.3-set-Fedora-specific-paths.patch b/0001-PyMca-4.7.3-set-Fedora-specific-paths.patch new file mode 100644 index 0000000..2b0ebbe --- /dev/null +++ b/0001-PyMca-4.7.3-set-Fedora-specific-paths.patch @@ -0,0 +1,27 @@ +From 8558867d2ede525b8c5f61564b4f7ec3faa647ff Mon Sep 17 00:00:00 2001 +From: Christopher Meng +Date: Wed, 23 Jul 2014 21:24:53 +0800 +Subject: [PATCH] PyMca-4.7.3-set-Fedora-specific-paths + +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index cd1ff24..e3fae11 100644 +--- a/setup.py ++++ b/setup.py +@@ -42,8 +42,8 @@ global USE_SMART_INSTALL_SCRIPTS + # The sift module implements a patented algorithm. The algorithm can be used + # for non-commercial research purposes. If you do not want to distribute it + # with the PyMca sources you just need to delete the PyMca/sift directory. +-PYMCA_DATA_DIR = os.path.join('PyMca','PyMcaData') +-PYMCA_DOC_DIR = os.path.join('PyMca','PyMcaData') ++PYMCA_DATA_DIR = '/usr/share/PyMca' ++PYMCA_DOC_DIR = '/usr/share/doc/PyMca' + USE_SMART_INSTALL_SCRIPTS = False + if "--install-scripts" in sys.argv: + USE_SMART_INSTALL_SCRIPTS = True +-- +2.0.1 + diff --git a/PyMca-4.5.0-format-security.patch b/PyMca-4.5.0-format-security.patch deleted file mode 100644 index b5241b7..0000000 --- a/PyMca-4.5.0-format-security.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/PyMca/Object3D/Object3DQhull/src/io.c b/PyMca/Object3D/Object3DQhull/src/io.c -index c219100..38d301d 100755 ---- a/PyMca/Object3D/Object3DQhull/src/io.c -+++ b/PyMca/Object3D/Object3DQhull/src/io.c -@@ -2166,7 +2166,7 @@ void qh_printfacet3math (FILE *fp, facetT *facet, int format, int notfirst) { - qh_memfree (point, qh normal_size); - qh_settempfree(&points); - qh_settempfree(&vertices); -- fprintf(fp, endfmt); -+ fprintf(fp, "%s", endfmt); - } /* printfacet3math */ - - diff --git a/PyMca.desktop b/PyMca.desktop index 976b334..09d1806 100644 --- a/PyMca.desktop +++ b/PyMca.desktop @@ -1,6 +1,6 @@ [Desktop Entry] -Encoding=UTF-8 Name=PyMca +GenericName=X-Ray Fluorescence Toolkit Comment=A collection of Python tools for visualization and analysis of energy-dispersive X-ray fluorescence data Exec=pymca Icon=PyMca diff --git a/PyMca.spec b/PyMca.spec index 5dd932b..94fde16 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,46 +1,121 @@ +# Linking issue, temporarily disabled. +# %if 0%{?fedora} >= 22 || 0%{?rhel} >= 8 +# %global with_python3 1 +# %else +%global with_python3 0 +# %endif + Name: PyMca Version: 4.7.3 Release: 1%{?dist} Summary: PyMca X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ -Source0: http://downloads.sourceforge.net/sourceforge/pymca/pymca%{version}-src.tgz +# 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. +# rm -frv PyMca/sift +Source0: pymca%{version}-src-clean.tgz Source1: PyMca.desktop +Source2: edfviewer.desktop +Source3: elementsinfo.desktop +Source4: mca2edf.desktop +Source5: peakidentifier.desktop +Source6: pymcabatch.desktop +Source7: pymcapostbatch.desktop +Source8: pymcaroitool.desktop +Patch0: 0001-PyMca-4.7.3-set-Fedora-specific-paths.patch BuildRequires: desktop-file-utils BuildRequires: ImageMagick +%if 0%{?with_python3} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-numpy +BuildRequires: python3-PyQt4 +%else BuildRequires: python2-devel BuildRequires: python-setuptools -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel BuildRequires: numpy BuildRequires: PyQt4 +%endif +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel BuildRequires: PyQwt BuildRequires: qhull-devel Requires: hicolor-icon-theme +%if 0%{?with_python3} +Requires: python3-numpy +Requires: python3-PyQt4 +%else Requires: numpy Requires: PyQt4 +%endif Requires: PyQwt +Requires: %{name}-data = %{version}-%{release} %description PyMCA provides a graphical interface for multi-channel analyser spectra visualization and analysis. PyMca can display spectra from a file or directly from SPEC during acquisitions. +%package data +Summary: Data files for %{name} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + +%description data +This package contains photon interaction data/elements data for %{name}. + %prep %setup -q +%patch0 -p1 +# Drop bundled qhull. rm -frv third-party/ +# Patch for the craps qhull brings in. +sed -i -e 's|"geom.h"||' \ + -e 's|"libqhull.h"||' \ + -e 's|"poly.h"||' \ + -e 's|"qset.h"||' \ + PyMca/Object3D/Object3DQhull/Object3DQhull.c # Fix wrong shebang of pymcapostbatch. +%if 0%{?with_python3} +sed -i "s|!python|!%{__python3}|g" PyMca/scripts/pymcapostbatch +%else sed -i "s|!python|!%{__python2}|g" PyMca/scripts/pymcapostbatch +%endif %build +# Need to define manually. Note using pkg-config to export the cflags +# is not identified by the setup.py script as it requires non-blank +# stdin for both CFLAGS/LDFLAGS, so we manually define the CFLAGS. +QHULL_CFLAGS="-I%{_includedir}/qhull" \ +QHULL_LIBS="-lqhull" \ +SPECFILE_USE_GNU_SOURCE=1 \ +%if 0%{?with_python3} +%{__python3} setup.py build +%else %{__python2} setup.py build +%endif %install +%if 0%{?with_python3} +%{__python3} setup.py install -O1 --skip-build --root %{buildroot} +%else %{__python2} setup.py install -O1 --skip-build --root %{buildroot} +%endif # Install desktop file. desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:1} +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:2} +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:3} +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:4} +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:5} +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:6} +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:7} +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:8} # Convert to various sizes, via the 256x256 source. for size in 192x192 128x128 96x96 72x72 64x64 48x48 40x40 36x36 32x32 26x26 24x24 22x22 16x16 ; do @@ -51,15 +126,35 @@ for size in 192x192 128x128 96x96 72x72 64x64 48x48 40x40 36x36 32x32 26x26 24x2 done # Get rid of spurious executable rights. -find %{buildroot}%{python2_sitearch}/PyMca/ -type f -exec chmod 644 {} \; -find %{buildroot}%{python2_sitearch}/PyMca/ -name *.so -exec chmod 755 {} \; +%if 0%{?with_python3} +find %{buildroot}%{python3_sitearch}/PyMca/ -type f -exec chmod 644 {} + +find %{buildroot}%{python3_sitearch}/PyMca/ -name *.so -exec chmod 755 {} + +%else +find %{buildroot}%{python2_sitearch}/PyMca/ -type f -exec chmod 644 {} + +find %{buildroot}%{python2_sitearch}/PyMca/ -name *.so -exec chmod 755 {} + +%endif # Get rid of /usr/bin/env in libraries. +%if 0%{?with_python3} +for lib in %{buildroot}%{python3_sitearch}/PyMca/*.py; do + sed '/\/usr\/bin\/env/d' $lib > $lib.new && + touch -r $lib $lib.new && + mv $lib.new $lib +done +%else for lib in %{buildroot}%{python2_sitearch}/PyMca/*.py; do sed '/\/usr\/bin\/env/d' $lib > $lib.new && touch -r $lib $lib.new && mv $lib.new $lib done +%endif + +%check +%if 0%{?with_python3} +PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} PyMca/tests/TestAll.py +%else +PYTHONPATH=%{buildroot}%{python2_sitearch} %{__python2} PyMca/tests/TestAll.py +%endif %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -81,11 +176,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/peakidentifier %{_bindir}/pymca* %{_bindir}/rgbcorrelator -%{_datadir}/applications/PyMca.desktop +%{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %{_mandir}/man1/*.1* +%if 0%{?with_python3} +%{python3_sitearch}/PyMca/ +%{python3_sitearch}/PyMca-%{version}-py%{python3_version}.egg-info +%else %{python2_sitearch}/PyMca/ %{python2_sitearch}/PyMca-%{version}-py%{python2_version}.egg-info +%endif +%exclude %{_pkgdocdir}/ + +%files data +%{_datadir}/%{name}/ +%{_pkgdocdir}/ %changelog * Fri Jul 04 2014 Christopher Meng - 4.7.3-1 diff --git a/edfviewer.desktop b/edfviewer.desktop new file mode 100644 index 0000000..27d68a1 --- /dev/null +++ b/edfviewer.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=EDFviewer +Comment=Tool to visualize image files which format has been wrapped as EDF into PyMca +GenericName=Simple ESRF Data Format(EDF) file viewer +Exec=edfviewer +Icon=PyMca +Terminal=false +StartupNotify=true +Type=Application +Categories=Education;Science;DataVisualization;Physics; diff --git a/elementsinfo.desktop b/elementsinfo.desktop new file mode 100644 index 0000000..5113c60 --- /dev/null +++ b/elementsinfo.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Elementsinfo +Comment=Displaying the shell constants and X-ray emission branching ratios as function of photon excitation energy +GenericName=Periodic table with Atomic Constants used by PyMca +Exec=elementsinfo +Icon=PyMca +Terminal=false +StartupNotify=true +Type=Application +Categories=Education;Science;DataVisualization;Physics; diff --git a/mca2edf.desktop b/mca2edf.desktop new file mode 100644 index 0000000..4f0a119 --- /dev/null +++ b/mca2edf.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=mca2EDF +Comment=Convert SPEC file format files to EDF format +GenericName=EDF format converter +Exec=mca2edf +Icon=PyMca +Terminal=false +StartupNotify=true +Type=Application +Categories=Education;Science;DataVisualization;Physics; diff --git a/peakidentifier.desktop b/peakidentifier.desktop new file mode 100644 index 0000000..5669868 --- /dev/null +++ b/peakidentifier.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Peakidentifier +Comment=Given an energy and a threshold, list all the elements emitting X-rays in the range +GenericName=List the possible elements of a given photon energy +Exec=peakidentifier +Icon=PyMca +Terminal=false +StartupNotify=true +Type=Application +Categories=Education;Science;DataVisualization;Physics; diff --git a/pymcabatch.desktop b/pymcabatch.desktop new file mode 100644 index 0000000..bdd5e3a --- /dev/null +++ b/pymcabatch.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=PyMcabatch +Comment=Batch fitting of X-ray Fluorescence Spectra +GenericName=Storing fitted parameters +Exec=pymcabatch +Icon=PyMca +Terminal=false +StartupNotify=true +Type=Application +Categories=Education;Science;DataVisualization;Physics; diff --git a/pymcapostbatch.desktop b/pymcapostbatch.desktop new file mode 100644 index 0000000..980dc1f --- /dev/null +++ b/pymcapostbatch.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=PyMcapostbatch +Comment=PyMca batch result analysis application +GenericName=Batch result analyzor +Exec=pymcapostbatch +Icon=PyMca +Terminal=false +StartupNotify=true +Type=Application +Categories=Education;Science;DataVisualization;Physics; diff --git a/pymcaroitool.desktop b/pymcaroitool.desktop new file mode 100644 index 0000000..b03fc32 --- /dev/null +++ b/pymcaroitool.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=PyMcaROItool +Comment=Handling datasets represented by three-dimensional arrays, like stacks of images or 2D maps of 1D spectra +GenericName=Region of Interest imaging tool for XRF analysis +Exec=pymcaroitool +Icon=PyMca +Terminal=false +StartupNotify=true +Type=Application +Categories=Education;Science;DataVisualization;Physics; diff --git a/sources b/sources index fa7fcbb..ee10b47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a624a37cee7d8cc916b33f3759429cc4 pymca4.5.0-src.tgz +a7ee68844591e15b1b65738f58929fb8 pymca4.7.3-src-clean.tgz From 433250cb0939d2a6d7864695085317b2ba3296cb Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 19:04:00 +0000 Subject: [PATCH 08/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 94fde16..229fc7b 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -7,7 +7,7 @@ Name: PyMca Version: 4.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PyMca X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -193,6 +193,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_pkgdocdir}/ %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 4.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jul 04 2014 Christopher Meng - 4.7.3-1 - Update to 4.7.3 From 00e8226db6cc9afd3c531e10cfdd80ff72381bc7 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 26 Mar 2015 16:08:28 +0000 Subject: [PATCH 09/80] Add an AppData file for the software center --- PyMca.spec | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 229fc7b..102684f 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -7,7 +7,7 @@ Name: PyMca Version: 4.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PyMca X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -117,6 +117,85 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:6} 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 < + + + CC0-1.0 + edfviewer.desktop + + PyMca.desktop + + +EOF +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/elementsinfo.appdata.xml < + + + CC0-1.0 + elementsinfo.desktop + + PyMca.desktop + + +EOF +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/mca2edf.appdata.xml < + + + CC0-1.0 + mca2edf.desktop + + PyMca.desktop + + +EOF +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/peakidentifier.appdata.xml < + + + CC0-1.0 + peakidentifier.desktop + + PyMca.desktop + + +EOF +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/pymcabatch.appdata.xml < + + + CC0-1.0 + pymcabatch.desktop + + PyMca.desktop + + +EOF +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/pymcapostbatch.appdata.xml < + + + CC0-1.0 + pymcapostbatch.desktop + + PyMca.desktop + + +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/pymcaroitool.appdata.xml < + + + CC0-1.0 + pymcaroitool.desktop + + PyMca.desktop + + +EOF + # Convert to various sizes, via the 256x256 source. for size in 192x192 128x128 96x96 72x72 64x64 48x48 40x40 36x36 32x32 26x26 24x24 22x22 16x16 ; do install -pdm755 \ @@ -176,6 +255,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/peakidentifier %{_bindir}/pymca* %{_bindir}/rgbcorrelator +%{_datadir}/appdata/*.appdata.xml %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %{_mandir}/man1/*.1* @@ -193,6 +273,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_pkgdocdir}/ %changelog +* Thu Mar 26 2015 Richard Hughes - 4.7.3-3 +- Add an AppData file for the software center + * Fri Aug 15 2014 Fedora Release Engineering - 4.7.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 4dfa77a9008d3677c519f736fac6a4f3c428f8f1 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 26 Mar 2015 17:27:51 +0000 Subject: [PATCH 10/80] trivial: Fix a typo in the last commit --- PyMca.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/PyMca.spec b/PyMca.spec index 102684f..17ae45b 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -184,6 +184,7 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/pymcapostbatch.appdata.xml <PyMca.desktop +EOF cat > $RPM_BUILD_ROOT%{_datadir}/appdata/pymcaroitool.appdata.xml < From eeb57d6c7f9b8161958d33fd58e9841d5e715d48 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:04:49 +0000 Subject: [PATCH 11/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 17ae45b..aa096e2 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -7,7 +7,7 @@ Name: PyMca Version: 4.7.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: PyMca X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -274,6 +274,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_pkgdocdir}/ %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 4.7.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Mar 26 2015 Richard Hughes - 4.7.3-3 - Add an AppData file for the software center From d1ac813c67e93a715bf045bd2bb791cd7c45498c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 15:36:17 +0000 Subject: [PATCH 12/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index aa096e2..63f2225 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -7,7 +7,7 @@ Name: PyMca Version: 4.7.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: PyMca X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -274,6 +274,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_pkgdocdir}/ %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 4.7.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jun 16 2015 Fedora Release Engineering - 4.7.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 6ccfe31136dd34627848035a3437cfa8a8a72d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Fri, 29 Apr 2016 15:14:23 +0200 Subject: [PATCH 13/80] Rebuild for qhull-2015.2-1. - Reflect qhull.h/libqhull.h's location having changed. --- PyMca.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 63f2225..138afc2 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -7,7 +7,7 @@ Name: PyMca Version: 4.7.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: PyMca X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -75,7 +75,11 @@ This package contains photon interaction data/elements data for %{name}. rm -frv third-party/ # Patch for the craps qhull brings in. sed -i -e 's|"geom.h"||' \ +%if 0%{?fedora} > 24 + -e 's|"libqhull.h"||' \ +%else -e 's|"libqhull.h"||' \ +%endif -e 's|"poly.h"||' \ -e 's|"qset.h"||' \ PyMca/Object3D/Object3DQhull/Object3DQhull.c @@ -91,7 +95,11 @@ sed -i "s|!python|!%{__python2}|g" PyMca/scripts/pymcapostbatch # Need to define manually. Note using pkg-config to export the cflags # is not identified by the setup.py script as it requires non-blank # stdin for both CFLAGS/LDFLAGS, so we manually define the CFLAGS. +%if 0%{?fedora} > 24 +QHULL_CFLAGS="-I%{_includedir}/libqhull" \ +%else QHULL_CFLAGS="-I%{_includedir}/qhull" \ +%endif QHULL_LIBS="-lqhull" \ SPECFILE_USE_GNU_SOURCE=1 \ %if 0%{?with_python3} @@ -274,6 +282,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_pkgdocdir}/ %changelog +* Fri Apr 29 2016 Ralf Corsépius - 4.7.3-6 +- Rebuild for qhull-2015.2-1. +- Reflect qhull.h/libqhull.h's location having changed. + * Wed Feb 03 2016 Fedora Release Engineering - 4.7.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 499678ebd502104847cc85e9acacd7b6945da49a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 06:25:09 +0000 Subject: [PATCH 14/80] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 138afc2..367f891 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -7,7 +7,7 @@ Name: PyMca Version: 4.7.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: PyMca X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -282,6 +282,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_pkgdocdir}/ %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 4.7.3-7 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Fri Apr 29 2016 Ralf Corsépius - 4.7.3-6 - Rebuild for qhull-2015.2-1. - Reflect qhull.h/libqhull.h's location having changed. From 98ce647e1bf7603038d1a45edf0fe5150479dbf2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:19:16 +0000 Subject: [PATCH 15/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 367f891..3ef9b32 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -7,7 +7,7 @@ Name: PyMca Version: 4.7.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: PyMca X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -282,6 +282,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_pkgdocdir}/ %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 4.7.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jul 19 2016 Fedora Release Engineering - 4.7.3-7 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From ac8143a66c195edadeba6ab800f28270b44c8975 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:02:22 +0000 Subject: [PATCH 16/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 3ef9b32..addccd8 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -7,7 +7,7 @@ Name: PyMca Version: 4.7.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: PyMca X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -282,6 +282,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_pkgdocdir}/ %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 4.7.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 4.7.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 9a2b31a9fdea780760d58f69e32cf6275a90d6c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:06:13 +0000 Subject: [PATCH 17/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index addccd8..d346709 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -7,7 +7,7 @@ Name: PyMca Version: 4.7.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: PyMca X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -282,6 +282,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_pkgdocdir}/ %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 4.7.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 4.7.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From bc75d95b232d84d55319398dcf5ff5be8bafab2a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 18 Jan 2018 22:03:17 +0100 Subject: [PATCH 18/80] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- PyMca.spec | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index d346709..17d3ff0 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -7,7 +7,7 @@ Name: PyMca Version: 4.7.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: PyMca X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -244,18 +244,6 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} PyMca/tests/TestAll.py PYTHONPATH=%{buildroot}%{python2_sitearch} %{__python2} PyMca/tests/TestAll.py %endif -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %files %doc changelog.txt LICENSE.GPL README %{_bindir}/edfviewer @@ -282,6 +270,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_pkgdocdir}/ %changelog +* Thu Jan 18 2018 Igor Gnatenko - 4.7.3-11 +- Remove obsolete scriptlets + * Wed Aug 02 2017 Fedora Release Engineering - 4.7.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 1651bf8d6d65183ba4d39c383797e084b29f1b22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 00:57:13 +0000 Subject: [PATCH 19/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 17d3ff0..02ef0a1 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -7,7 +7,7 @@ Name: PyMca Version: 4.7.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: PyMca X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -270,6 +270,9 @@ PYTHONPATH=%{buildroot}%{python2_sitearch} %{__python2} PyMca/tests/TestAll.py %{_pkgdocdir}/ %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 4.7.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jan 18 2018 Igor Gnatenko - 4.7.3-11 - Remove obsolete scriptlets From ab293b33534014ffc5239f696f5b28384228fb29 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 10 Jul 2018 15:56:26 +0200 Subject: [PATCH 20/80] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- PyMca.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/PyMca.spec b/PyMca.spec index 02ef0a1..f308256 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -27,6 +27,7 @@ Source6: pymcabatch.desktop Source7: pymcapostbatch.desktop Source8: pymcaroitool.desktop Patch0: 0001-PyMca-4.7.3-set-Fedora-specific-paths.patch +BuildRequires: gcc BuildRequires: desktop-file-utils BuildRequires: ImageMagick %if 0%{?with_python3} From 07921e53e67f7a2d590aab147b431817a1d93d1d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 19:12:52 +0000 Subject: [PATCH 21/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index f308256..1d139cb 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -7,7 +7,7 @@ Name: PyMca Version: 4.7.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: PyMca X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -271,6 +271,9 @@ PYTHONPATH=%{buildroot}%{python2_sitearch} %{__python2} PyMca/tests/TestAll.py %{_pkgdocdir}/ %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 4.7.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 4.7.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 4c09c0d404cfc2c5505ce7907a5447ae82c4dfd3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 11:49:13 +0000 Subject: [PATCH 22/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 1d139cb..6a76eb0 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -7,7 +7,7 @@ Name: PyMca Version: 4.7.3 -Release: 13%{?dist} +Release: 14%{?dist} Summary: PyMca X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -271,6 +271,9 @@ PYTHONPATH=%{buildroot}%{python2_sitearch} %{__python2} PyMca/tests/TestAll.py %{_pkgdocdir}/ %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 4.7.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 4.7.3-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 6771d2a31ab1c465740d7e882e1138e64862577e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 12 Feb 2019 15:52:28 +0100 Subject: [PATCH 23/80] https://fedoraproject.org/wiki/Changes/Python_Extension_Flags --- PyMca.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index 6a76eb0..a58e5f9 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -104,14 +104,14 @@ QHULL_CFLAGS="-I%{_includedir}/qhull" \ QHULL_LIBS="-lqhull" \ SPECFILE_USE_GNU_SOURCE=1 \ %if 0%{?with_python3} -%{__python3} setup.py build +%py3_build %else %{__python2} setup.py build %endif %install %if 0%{?with_python3} -%{__python3} setup.py install -O1 --skip-build --root %{buildroot} +%py3_install %else %{__python2} setup.py install -O1 --skip-build --root %{buildroot} %endif From aaf58a440b5b7c1111a9ee4f6b9329f48706047d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 30 Apr 2019 10:58:11 +0200 Subject: [PATCH 24/80] Drop python3 conditionals (and python2 support). --- PyMca.spec | 61 ------------------------------------------------------ 1 file changed, 61 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index a58e5f9..6c82b73 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,10 +1,3 @@ -# Linking issue, temporarily disabled. -# %if 0%{?fedora} >= 22 || 0%{?rhel} >= 8 -# %global with_python3 1 -# %else -%global with_python3 0 -# %endif - Name: PyMca Version: 4.7.3 Release: 14%{?dist} @@ -30,29 +23,17 @@ Patch0: 0001-PyMca-4.7.3-set-Fedora-specific-paths.patch BuildRequires: gcc BuildRequires: desktop-file-utils BuildRequires: ImageMagick -%if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-numpy BuildRequires: python3-PyQt4 -%else -BuildRequires: python2-devel -BuildRequires: python-setuptools -BuildRequires: numpy -BuildRequires: PyQt4 -%endif BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel BuildRequires: PyQwt BuildRequires: qhull-devel Requires: hicolor-icon-theme -%if 0%{?with_python3} Requires: python3-numpy Requires: python3-PyQt4 -%else -Requires: numpy -Requires: PyQt4 -%endif Requires: PyQwt Requires: %{name}-data = %{version}-%{release} @@ -76,45 +57,25 @@ This package contains photon interaction data/elements data for %{name}. rm -frv third-party/ # Patch for the craps qhull brings in. sed -i -e 's|"geom.h"||' \ -%if 0%{?fedora} > 24 -e 's|"libqhull.h"||' \ -%else - -e 's|"libqhull.h"||' \ -%endif -e 's|"poly.h"||' \ -e 's|"qset.h"||' \ PyMca/Object3D/Object3DQhull/Object3DQhull.c # Fix wrong shebang of pymcapostbatch. -%if 0%{?with_python3} sed -i "s|!python|!%{__python3}|g" PyMca/scripts/pymcapostbatch -%else -sed -i "s|!python|!%{__python2}|g" PyMca/scripts/pymcapostbatch -%endif %build # Need to define manually. Note using pkg-config to export the cflags # is not identified by the setup.py script as it requires non-blank # stdin for both CFLAGS/LDFLAGS, so we manually define the CFLAGS. -%if 0%{?fedora} > 24 QHULL_CFLAGS="-I%{_includedir}/libqhull" \ -%else -QHULL_CFLAGS="-I%{_includedir}/qhull" \ -%endif QHULL_LIBS="-lqhull" \ SPECFILE_USE_GNU_SOURCE=1 \ -%if 0%{?with_python3} %py3_build -%else -%{__python2} setup.py build -%endif %install -%if 0%{?with_python3} %py3_install -%else -%{__python2} setup.py install -O1 --skip-build --root %{buildroot} -%endif # Install desktop file. desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:1} @@ -215,35 +176,18 @@ for size in 192x192 128x128 96x96 72x72 64x64 48x48 40x40 36x36 32x32 26x26 24x2 done # Get rid of spurious executable rights. -%if 0%{?with_python3} find %{buildroot}%{python3_sitearch}/PyMca/ -type f -exec chmod 644 {} + find %{buildroot}%{python3_sitearch}/PyMca/ -name *.so -exec chmod 755 {} + -%else -find %{buildroot}%{python2_sitearch}/PyMca/ -type f -exec chmod 644 {} + -find %{buildroot}%{python2_sitearch}/PyMca/ -name *.so -exec chmod 755 {} + -%endif # Get rid of /usr/bin/env in libraries. -%if 0%{?with_python3} for lib in %{buildroot}%{python3_sitearch}/PyMca/*.py; do sed '/\/usr\/bin\/env/d' $lib > $lib.new && touch -r $lib $lib.new && mv $lib.new $lib done -%else -for lib in %{buildroot}%{python2_sitearch}/PyMca/*.py; do - sed '/\/usr\/bin\/env/d' $lib > $lib.new && - touch -r $lib $lib.new && - mv $lib.new $lib -done -%endif %check -%if 0%{?with_python3} PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} PyMca/tests/TestAll.py -%else -PYTHONPATH=%{buildroot}%{python2_sitearch} %{__python2} PyMca/tests/TestAll.py -%endif %files %doc changelog.txt LICENSE.GPL README @@ -257,13 +201,8 @@ PYTHONPATH=%{buildroot}%{python2_sitearch} %{__python2} PyMca/tests/TestAll.py %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %{_mandir}/man1/*.1* -%if 0%{?with_python3} %{python3_sitearch}/PyMca/ %{python3_sitearch}/PyMca-%{version}-py%{python3_version}.egg-info -%else -%{python2_sitearch}/PyMca/ -%{python2_sitearch}/PyMca-%{version}-py%{python2_version}.egg-info -%endif %exclude %{_pkgdocdir}/ %files data From 3bf2d233be51af857f0bafcc130ea258ca86c4f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 30 Apr 2019 15:59:47 +0200 Subject: [PATCH 25/80] Upgrade to 5.4.3 --- .gitignore | 11 +-- ...yMca-4.7.3-set-Fedora-specific-paths.patch | 27 ------- PyMca.spec | 78 ++++++++++--------- getsources.sh | 25 ++++++ sources | 2 +- 5 files changed, 75 insertions(+), 68 deletions(-) delete mode 100644 0001-PyMca-4.7.3-set-Fedora-specific-paths.patch create mode 100755 getsources.sh diff --git a/.gitignore b/.gitignore index 9da8272..ffa3a17 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ -pymca4.4.0-src.tgz -/pymca4.4.1-src.tgz -/pymca4.4.1p1-src.tgz -/pymca4.5.0-src.tgz -/pymca4.7.3-src-clean.tgz +/pymca-*.tar.xz +*~ +/x86_64/ +/noarch/ +/.build*.log +/pymca-*/ diff --git a/0001-PyMca-4.7.3-set-Fedora-specific-paths.patch b/0001-PyMca-4.7.3-set-Fedora-specific-paths.patch deleted file mode 100644 index 2b0ebbe..0000000 --- a/0001-PyMca-4.7.3-set-Fedora-specific-paths.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8558867d2ede525b8c5f61564b4f7ec3faa647ff Mon Sep 17 00:00:00 2001 -From: Christopher Meng -Date: Wed, 23 Jul 2014 21:24:53 +0800 -Subject: [PATCH] PyMca-4.7.3-set-Fedora-specific-paths - ---- - setup.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index cd1ff24..e3fae11 100644 ---- a/setup.py -+++ b/setup.py -@@ -42,8 +42,8 @@ global USE_SMART_INSTALL_SCRIPTS - # The sift module implements a patented algorithm. The algorithm can be used - # for non-commercial research purposes. If you do not want to distribute it - # with the PyMca sources you just need to delete the PyMca/sift directory. --PYMCA_DATA_DIR = os.path.join('PyMca','PyMcaData') --PYMCA_DOC_DIR = os.path.join('PyMca','PyMcaData') -+PYMCA_DATA_DIR = '/usr/share/PyMca' -+PYMCA_DOC_DIR = '/usr/share/doc/PyMca' - USE_SMART_INSTALL_SCRIPTS = False - if "--install-scripts" in sys.argv: - USE_SMART_INSTALL_SCRIPTS = True --- -2.0.1 - diff --git a/PyMca.spec b/PyMca.spec index 6c82b73..6bf0cf2 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,16 +1,18 @@ Name: PyMca -Version: 4.7.3 -Release: 14%{?dist} -Summary: PyMca X-ray Fluorescence Toolkit +Version: 5.4.3 +Release: 1%{?dist} +Summary: X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ -# 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. -# rm -frv PyMca/sift -Source0: pymca%{version}-src-clean.tgz +%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} +%endif +Source0: pymca-%{version}-filtered.tar.xz Source1: PyMca.desktop Source2: edfviewer.desktop Source3: elementsinfo.desktop @@ -19,40 +21,37 @@ Source5: peakidentifier.desktop Source6: pymcabatch.desktop Source7: pymcapostbatch.desktop Source8: pymcaroitool.desktop -Patch0: 0001-PyMca-4.7.3-set-Fedora-specific-paths.patch BuildRequires: gcc BuildRequires: desktop-file-utils BuildRequires: ImageMagick BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-numpy +BuildRequires: %py3_dist cython +BuildRequires: %py3_dist numpy BuildRequires: python3-PyQt4 +BuildRequires: %py3_dist fisx BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel BuildRequires: PyQwt BuildRequires: qhull-devel Requires: hicolor-icon-theme -Requires: python3-numpy -Requires: python3-PyQt4 -Requires: PyQwt Requires: %{name}-data = %{version}-%{release} %description -PyMCA provides a graphical interface for multi-channel analyser spectra +PyMCA provides a graphical interface for multi-channel analyzer spectra visualization and analysis. PyMca can display spectra from a file or directly from SPEC during acquisitions. %package data Summary: Data files for %{name} BuildArch: noarch -Requires: %{name} = %{version}-%{release} %description data This package contains photon interaction data/elements data for %{name}. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 -n pymca-%{version} + # Drop bundled qhull. rm -frv third-party/ # Patch for the craps qhull brings in. @@ -60,10 +59,10 @@ sed -i -e 's|"geom.h"||' \ -e 's|"libqhull.h"||' \ -e 's|"poly.h"||' \ -e 's|"qset.h"||' \ - PyMca/Object3D/Object3DQhull/Object3DQhull.c + PyMca5/Object3D/Object3DQhull/Object3DQhull.c # Fix wrong shebang of pymcapostbatch. -sed -i "s|!python|!%{__python3}|g" PyMca/scripts/pymcapostbatch +sed -i "s|!python|!%{__python3}|g" PyMca5/scripts/pymcapostbatch %build # Need to define manually. Note using pkg-config to export the cflags @@ -72,9 +71,13 @@ sed -i "s|!python|!%{__python3}|g" PyMca/scripts/pymcapostbatch QHULL_CFLAGS="-I%{_includedir}/libqhull" \ QHULL_LIBS="-lqhull" \ SPECFILE_USE_GNU_SOURCE=1 \ +PYMCA_DATA_DIR=/usr/share/PyMca \ +PYMCA_DOC_DIR=/usr/share/doc/PyMca \ %py3_build %install +PYMCA_DATA_DIR=/usr/share/PyMca \ +PYMCA_DOC_DIR=/usr/share/doc/PyMca \ %py3_install # Install desktop file. @@ -170,27 +173,29 @@ EOF # Convert to various sizes, via the 256x256 source. for size in 192x192 128x128 96x96 72x72 64x64 48x48 40x40 36x36 32x32 26x26 24x24 22x22 16x16 ; do install -pdm755 \ - %{buildroot}%{_datadir}/icons/hicolor/${size}/apps + %{buildroot}%{_datadir}/icons/hicolor/${size}/apps convert -resize ${size} icons/PyMca_256x256.png \ - %{buildroot}%{_datadir}/icons/hicolor/${size}/apps/%{name}.png + %{buildroot}%{_datadir}/icons/hicolor/${size}/apps/%{name}.png done # Get rid of spurious executable rights. -find %{buildroot}%{python3_sitearch}/PyMca/ -type f -exec chmod 644 {} + -find %{buildroot}%{python3_sitearch}/PyMca/ -name *.so -exec chmod 755 {} + +find %{buildroot}%{python3_sitearch}/PyMca5/ -type f -exec chmod 644 {} + +find %{buildroot}%{python3_sitearch}/PyMca5/ -name *.so -exec chmod 755 {} + # Get rid of /usr/bin/env in libraries. -for lib in %{buildroot}%{python3_sitearch}/PyMca/*.py; do - sed '/\/usr\/bin\/env/d' $lib > $lib.new && - touch -r $lib $lib.new && - mv $lib.new $lib -done +find %{buildroot}%{python3_sitearch}/PyMca5 -type f -name '*.py' \ + -exec sed -i '/\/usr\/bin\/env/d' {} + \ + -exec touch -r setup.py {} + %check -PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} PyMca/tests/TestAll.py +PYTHONPATH=%{buildroot}%{python3_sitearch} \ +PYMCA_DATA_DIR=%{buildroot}/usr/share/PyMca \ +PYMCA_DOC_DIR=%{buildroot}/usr/share/doc/PyMca \ +%{__python3} PyMca5/tests/TestAll.py %files -%doc changelog.txt LICENSE.GPL README +%license LICENSE.GPL +%doc changelog.txt README %{_bindir}/edfviewer %{_bindir}/elementsinfo %{_bindir}/mca2edf @@ -201,15 +206,18 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} PyMca/tests/TestAll.py %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %{_mandir}/man1/*.1* -%{python3_sitearch}/PyMca/ -%{python3_sitearch}/PyMca-%{version}-py%{python3_version}.egg-info -%exclude %{_pkgdocdir}/ +%{python3_sitearch}/PyMca5/ +%{python3_sitearch}/PyMca5-%{version}-py%{python3_version}.egg-info +%exclude %{_pkgdocdir} %files data %{_datadir}/%{name}/ %{_pkgdocdir}/ %changelog +* Tue Apr 30 2019 Zbigniew Jędrzejewski-Szmek - 5.4.3-1 +- Update to latest version (#1198140) + * Thu Jan 31 2019 Fedora Release Engineering - 4.7.3-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/getsources.sh b/getsources.sh new file mode 100755 index 0000000..4882e94 --- /dev/null +++ b/getsources.sh @@ -0,0 +1,25 @@ +#!/bin/sh -e + +# Usage: ./getsources.sh [version] +# (this produces pymca-[version]-filtered.tar.xz) +if [ -n "$1" ]; then + version="$1" +else + version="$(awk '/^Version:/{print $2}' *.spec)" +fi + +fname="pymca-${version}-filtered.tar.xz" +if [ -e "$fname" ]; then + echo "$fname already exists, not downloading" + exit 0 +fi + +echo "Downloading version ${version}" +[ -x /bin/pxz ] && xz=pxz || xz=xz + +curl -sSL https://github.com/vasole/pymca/archive/v${version}/PyMca-${version}.tar.gz | \ + zcat | \ + tar --delete --wildcards -f - '*/sift/*' | \ + $xz -9v > "$fname" + +echo "$fname is ready" diff --git a/sources b/sources index ee10b47..8eca1d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a7ee68844591e15b1b65738f58929fb8 pymca4.7.3-src-clean.tgz +SHA512 (pymca-5.4.3-filtered.tar.xz) = d865bf5d65d707598d8662966b8c25143a3c2fa02e841f5a84508e7595c9650f7b1e8f704b82f50c89237e05761227d5155612ce84153f2c3158e7221c98bbf9 From 6266c6698ef9de531831f9df029a82adbb50d65c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 16:06:32 +0000 Subject: [PATCH 26/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 6bf0cf2..1709724 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,6 +1,6 @@ Name: PyMca Version: 5.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -215,6 +215,9 @@ PYMCA_DOC_DIR=%{buildroot}/usr/share/doc/PyMca \ %{_pkgdocdir}/ %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 5.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Apr 30 2019 Zbigniew Jędrzejewski-Szmek - 5.4.3-1 - Update to latest version (#1198140) From 32a0f0a6956e058196393307fe611b6352146ca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 27 Jun 2019 10:06:32 +0200 Subject: [PATCH 27/80] Drop dependency on PyQwt and pull in h5py for tests --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 1709724..99208aa 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -32,8 +32,8 @@ BuildRequires: python3-PyQt4 BuildRequires: %py3_dist fisx BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel -BuildRequires: PyQwt BuildRequires: qhull-devel +BuildRequires: %py3_dist h5py Requires: hicolor-icon-theme Requires: %{name}-data = %{version}-%{release} @@ -215,6 +215,9 @@ PYMCA_DOC_DIR=%{buildroot}/usr/share/doc/PyMca \ %{_pkgdocdir}/ %changelog +* Mon Jul 29 2019 Zbigniew Jędrzejewski-Szmek +- Drop dependency on PyQwt, it is not necessary anymore (#1724456) + * Wed Jul 24 2019 Fedora Release Engineering - 5.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From b25b013b9441d39ca6dcbafc83a6f32d429fa348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 29 Jul 2019 09:27:02 +0200 Subject: [PATCH 28/80] Untabify to make rpmlint happy --- PyMca.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index 99208aa..9d08fc3 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -173,9 +173,9 @@ EOF # Convert to various sizes, via the 256x256 source. for size in 192x192 128x128 96x96 72x72 64x64 48x48 40x40 36x36 32x32 26x26 24x24 22x22 16x16 ; do install -pdm755 \ - %{buildroot}%{_datadir}/icons/hicolor/${size}/apps + %{buildroot}%{_datadir}/icons/hicolor/${size}/apps convert -resize ${size} icons/PyMca_256x256.png \ - %{buildroot}%{_datadir}/icons/hicolor/${size}/apps/%{name}.png + %{buildroot}%{_datadir}/icons/hicolor/${size}/apps/%{name}.png done # Get rid of spurious executable rights. From 27b090db7e53d25a659d5423e9ccba47b8d48d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 29 Jul 2019 10:24:57 +0200 Subject: [PATCH 29/80] Update to 5.5.0 --- PyMca.spec | 6 +++--- sources | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index 9d08fc3..aa9e2bb 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,6 +1,6 @@ Name: PyMca -Version: 5.4.3 -Release: 2%{?dist} +Version: 5.5.0 +Release: 1%{?dist} Summary: X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -195,7 +195,7 @@ PYMCA_DOC_DIR=%{buildroot}/usr/share/doc/PyMca \ %files %license LICENSE.GPL -%doc changelog.txt README +%doc changelog.txt README.rst %{_bindir}/edfviewer %{_bindir}/elementsinfo %{_bindir}/mca2edf diff --git a/sources b/sources index 8eca1d5..04b4f1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pymca-5.4.3-filtered.tar.xz) = d865bf5d65d707598d8662966b8c25143a3c2fa02e841f5a84508e7595c9650f7b1e8f704b82f50c89237e05761227d5155612ce84153f2c3158e7221c98bbf9 +SHA512 (pymca-5.5.0-filtered.tar.xz) = 83c325329605ee410cf2c1e296db261191d528bbe3a08ab4d33a6bd20700533b0e91592a4fc93b5d483ab7d85ed86f653f439d699895b7eea4073c4bdf59d95d From 03ad5c4bc26c8ba0aaf71de8dc86929556af3735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:00:36 +0200 Subject: [PATCH 30/80] Rebuilt for Python 3.8 --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index aa9e2bb..5e8b5fb 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,6 +1,6 @@ Name: PyMca Version: 5.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -215,6 +215,9 @@ PYMCA_DOC_DIR=%{buildroot}/usr/share/doc/PyMca \ %{_pkgdocdir}/ %changelog +* Mon Aug 19 2019 Miro Hrončok - 5.5.0-2 +- Rebuilt for Python 3.8 + * Mon Jul 29 2019 Zbigniew Jędrzejewski-Szmek - Drop dependency on PyQwt, it is not necessary anymore (#1724456) From ebc4d9a95e4ed5e0950dbfd107952ff30cf0bf2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 13:49:57 +0200 Subject: [PATCH 31/80] Rebuilt for Python 3.8.0rc1 (#1748018) --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 5e8b5fb..57e5df8 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,6 +1,6 @@ Name: PyMca Version: 5.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -215,6 +215,9 @@ PYMCA_DOC_DIR=%{buildroot}/usr/share/doc/PyMca \ %{_pkgdocdir}/ %changelog +* Thu Oct 03 2019 Miro Hrončok - 5.5.0-3 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Mon Aug 19 2019 Miro Hrončok - 5.5.0-2 - Rebuilt for Python 3.8 From a8b65a59e22f617af2ff2b6c3a62d14b29798047 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 09:41:37 +0000 Subject: [PATCH 32/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 57e5df8..5a38218 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,6 +1,6 @@ Name: PyMca Version: 5.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -215,6 +215,9 @@ PYMCA_DOC_DIR=%{buildroot}/usr/share/doc/PyMca \ %{_pkgdocdir}/ %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 5.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Oct 03 2019 Miro Hrončok - 5.5.0-3 - Rebuilt for Python 3.8.0rc1 (#1748018) From 5dbaf28e5acf3254a09aa5a5300d24d778c14243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 02:39:34 +0200 Subject: [PATCH 33/80] Rebuilt for Python 3.9 --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 5a38218..362a379 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,6 +1,6 @@ Name: PyMca Version: 5.5.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -215,6 +215,9 @@ PYMCA_DOC_DIR=%{buildroot}/usr/share/doc/PyMca \ %{_pkgdocdir}/ %changelog +* Tue May 26 2020 Miro Hrončok - 5.5.0-5 +- Rebuilt for Python 3.9 + * Tue Jan 28 2020 Fedora Release Engineering - 5.5.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From a4ea3186ed4f84a17ee89a321808791c87de06cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 10:35:40 +0000 Subject: [PATCH 34/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 362a379..3383b8d 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,6 +1,6 @@ Name: PyMca Version: 5.5.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -215,6 +215,9 @@ PYMCA_DOC_DIR=%{buildroot}/usr/share/doc/PyMca \ %{_pkgdocdir}/ %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 5.5.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 5.5.0-5 - Rebuilt for Python 3.9 From e9fa4565288e45df88a509161f8c148e67950695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 6 Jan 2021 18:20:29 +0100 Subject: [PATCH 35/80] Fix build --- PyMca.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index 3383b8d..1706cc5 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -28,7 +28,8 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: %py3_dist cython BuildRequires: %py3_dist numpy -BuildRequires: python3-PyQt4 +BuildRequires: %py3_dist matplotlib +BuildRequires: %py3_dist pyqt5 BuildRequires: %py3_dist fisx BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel @@ -64,6 +65,9 @@ sed -i -e 's|"geom.h"||' \ # 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/' + %build # Need to define manually. Note using pkg-config to export the cflags # is not identified by the setup.py script as it requires non-blank @@ -191,7 +195,14 @@ find %{buildroot}%{python3_sitearch}/PyMca5 -type f -name '*.py' \ PYTHONPATH=%{buildroot}%{python3_sitearch} \ PYMCA_DATA_DIR=%{buildroot}/usr/share/PyMca \ PYMCA_DOC_DIR=%{buildroot}/usr/share/doc/PyMca \ -%{__python3} PyMca5/tests/TestAll.py +QT_QPA_PLATFORM=offscreen \ +%{__python3} PyMca5/tests/TestAll.py || : + +# Test results are ingored. In F34 rawhide mock: +# ERROR: testHdf5Uri (ConfigDictTest.testConfigDict) +# FAIL: testNxExtStringAttribute (NexusUtilsTest.testNexusUtils) +# FAIL: testNxExtStringDataset (NexusUtilsTest.testNexusUtils) +# FAIL: testNxStringDataset (NexusUtilsTest.testNexusUtils) %files %license LICENSE.GPL @@ -215,6 +226,9 @@ PYMCA_DOC_DIR=%{buildroot}/usr/share/doc/PyMca \ %{_pkgdocdir}/ %changelog +* Wed Jan 6 2021 Zbigniew Jędrzejewski-Szmek - 5.5.0-6 +- Fix build, ignore test results (#1903058) + * Mon Jul 27 2020 Fedora Release Engineering - 5.5.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 22c1d6d3527f8630b404991100bfac44e120187d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 22:37:36 +0000 Subject: [PATCH 36/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 1706cc5..1f8a1d6 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,6 +1,6 @@ Name: PyMca Version: 5.5.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -226,6 +226,9 @@ QT_QPA_PLATFORM=offscreen \ %{_pkgdocdir}/ %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 5.5.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 6 2021 Zbigniew Jędrzejewski-Szmek - 5.5.0-6 - Fix build, ignore test results (#1903058) From a51d67db7f075fd38c5f8d38be9b4a950e11f5d8 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:17:08 +0200 Subject: [PATCH 37/80] Rebuilt for Python 3.10 --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 1f8a1d6..a7e721b 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,6 +1,6 @@ Name: PyMca Version: 5.5.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -226,6 +226,9 @@ QT_QPA_PLATFORM=offscreen \ %{_pkgdocdir}/ %changelog +* Fri Jun 04 2021 Python Maint - 5.5.0-8 +- Rebuilt for Python 3.10 + * Mon Jan 25 2021 Fedora Release Engineering - 5.5.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From b1940f9936183d44c08d4270936832981291d965 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 11:06:39 +0000 Subject: [PATCH 38/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 37fd92945fe7a235e7f2bb46ef1fba8d5af9016d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 16:01:08 +0000 Subject: [PATCH 39/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyMca.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index a7e721b..c571d3f 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,6 +1,6 @@ Name: PyMca Version: 5.5.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -226,6 +226,9 @@ QT_QPA_PLATFORM=offscreen \ %{_pkgdocdir}/ %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 5.5.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 5.5.0-8 - Rebuilt for Python 3.10 From 501fe15e188c23733dd68d7aa0d1519b04f6cacd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 29 Sep 2021 11:40:59 +0200 Subject: [PATCH 40/80] Convert to rpmautospec --- PyMca.spec | 135 +---------------------------------------------------- changelog | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 133 deletions(-) create mode 100644 changelog diff --git a/PyMca.spec b/PyMca.spec index c571d3f..9416dce 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,6 +1,6 @@ Name: PyMca Version: 5.5.0 -Release: 9%{?dist} +Release: %autorelease Summary: X-ray Fluorescence Toolkit License: GPLv2+ URL: http://pymca.sourceforge.net/ @@ -226,135 +226,4 @@ QT_QPA_PLATFORM=offscreen \ %{_pkgdocdir}/ %changelog -* Wed Jul 21 2021 Fedora Release Engineering - 5.5.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 5.5.0-8 -- Rebuilt for Python 3.10 - -* Mon Jan 25 2021 Fedora Release Engineering - 5.5.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jan 6 2021 Zbigniew Jędrzejewski-Szmek - 5.5.0-6 -- Fix build, ignore test results (#1903058) - -* Mon Jul 27 2020 Fedora Release Engineering - 5.5.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 5.5.0-5 -- Rebuilt for Python 3.9 - -* Tue Jan 28 2020 Fedora Release Engineering - 5.5.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 5.5.0-3 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Miro Hrončok - 5.5.0-2 -- Rebuilt for Python 3.8 - -* Mon Jul 29 2019 Zbigniew Jędrzejewski-Szmek -- Drop dependency on PyQwt, it is not necessary anymore (#1724456) - -* Wed Jul 24 2019 Fedora Release Engineering - 5.4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Apr 30 2019 Zbigniew Jędrzejewski-Szmek - 5.4.3-1 -- Update to latest version (#1198140) - -* Thu Jan 31 2019 Fedora Release Engineering - 4.7.3-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 4.7.3-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 4.7.3-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 18 2018 Igor Gnatenko - 4.7.3-11 -- Remove obsolete scriptlets - -* Wed Aug 02 2017 Fedora Release Engineering - 4.7.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 4.7.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 4.7.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jul 19 2016 Fedora Release Engineering - 4.7.3-7 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Fri Apr 29 2016 Ralf Corsépius - 4.7.3-6 -- Rebuild for qhull-2015.2-1. -- Reflect qhull.h/libqhull.h's location having changed. - -* Wed Feb 03 2016 Fedora Release Engineering - 4.7.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jun 16 2015 Fedora Release Engineering - 4.7.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Mar 26 2015 Richard Hughes - 4.7.3-3 -- Add an AppData file for the software center - -* Fri Aug 15 2014 Fedora Release Engineering - 4.7.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jul 04 2014 Christopher Meng - 4.7.3-1 -- Update to 4.7.3 - -* Wed Jun 18 2014 Yaakov Selkowitz - 4.5.0-6 -- Fix FTBFS with -Werror=format-security (#1105919) -- Cleanup spec - -* Fri Jun 06 2014 Fedora Release Engineering - 4.5.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Aug 02 2013 Fedora Release Engineering - 4.5.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 4.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 4.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Mar 24 2012 Jussi Lehtola - 4.5.0-1 -- Update to 4.5.0. - -* Thu Jan 12 2012 Fedora Release Engineering - 4.4.1-5.p1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Jul 14 2011 Jussi Lehtola - 4.4.1-4.p1 -- Fix binary permissions (BZ #721149). - -* Fri Feb 25 2011 Jussi Lehtola - 4.4.1-3.p1 -- Update to 4.4.1p1. - -* Mon Feb 07 2011 Fedora Release Engineering - 4.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Dec 10 2010 Jussi Lehtola - 4.4.1-1 -- Update to 4.4.1. - -* Wed Jul 21 2010 David Malcolm - 4.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Sat Jun 19 2010 Jussi Lehtola - 4.4.0-1 -- Update to 4.4.0. - -* Fri Oct 30 2009 Jussi Lehtola - 4.3.0-4 -- Keep time stamps also on binfiles. - -* Fri Oct 30 2009 Jussi Lehtola - 4.3.0-3 -- Added BR: python-devel. -- Added desktop file. - -* Fri Oct 30 2009 Jussi Lehtola - 4.3.0-2 -- Keep time stamps during sed of libraries. -- Changed BR: python-setuptools-devel to python-setuptools-devel. - -* Thu Oct 08 2009 Jussi Lehtola - 4.3.0-1 -- First release. +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..9bd2c0d --- /dev/null +++ b/changelog @@ -0,0 +1,132 @@ +* Wed Jul 21 2021 Fedora Release Engineering - 5.5.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 5.5.0-8 +- Rebuilt for Python 3.10 + +* Mon Jan 25 2021 Fedora Release Engineering - 5.5.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 6 2021 Zbigniew Jędrzejewski-Szmek - 5.5.0-6 +- Fix build, ignore test results (#1903058) + +* Mon Jul 27 2020 Fedora Release Engineering - 5.5.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 5.5.0-5 +- Rebuilt for Python 3.9 + +* Tue Jan 28 2020 Fedora Release Engineering - 5.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 5.5.0-3 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 5.5.0-2 +- Rebuilt for Python 3.8 + +* Mon Jul 29 2019 Zbigniew Jędrzejewski-Szmek +- Drop dependency on PyQwt, it is not necessary anymore (#1724456) + +* Wed Jul 24 2019 Fedora Release Engineering - 5.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Apr 30 2019 Zbigniew Jędrzejewski-Szmek - 5.4.3-1 +- Update to latest version (#1198140) + +* Thu Jan 31 2019 Fedora Release Engineering - 4.7.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 4.7.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 4.7.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 18 2018 Igor Gnatenko - 4.7.3-11 +- Remove obsolete scriptlets + +* Wed Aug 02 2017 Fedora Release Engineering - 4.7.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 4.7.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 4.7.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jul 19 2016 Fedora Release Engineering - 4.7.3-7 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Fri Apr 29 2016 Ralf Corsépius - 4.7.3-6 +- Rebuild for qhull-2015.2-1. +- Reflect qhull.h/libqhull.h's location having changed. + +* Wed Feb 03 2016 Fedora Release Engineering - 4.7.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jun 16 2015 Fedora Release Engineering - 4.7.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Mar 26 2015 Richard Hughes - 4.7.3-3 +- Add an AppData file for the software center + +* Fri Aug 15 2014 Fedora Release Engineering - 4.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jul 04 2014 Christopher Meng - 4.7.3-1 +- Update to 4.7.3 + +* Wed Jun 18 2014 Yaakov Selkowitz - 4.5.0-6 +- Fix FTBFS with -Werror=format-security (#1105919) +- Cleanup spec + +* Fri Jun 06 2014 Fedora Release Engineering - 4.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Aug 02 2013 Fedora Release Engineering - 4.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 4.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 4.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Mar 24 2012 Jussi Lehtola - 4.5.0-1 +- Update to 4.5.0. + +* Thu Jan 12 2012 Fedora Release Engineering - 4.4.1-5.p1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Jul 14 2011 Jussi Lehtola - 4.4.1-4.p1 +- Fix binary permissions (BZ #721149). + +* Fri Feb 25 2011 Jussi Lehtola - 4.4.1-3.p1 +- Update to 4.4.1p1. + +* Mon Feb 07 2011 Fedora Release Engineering - 4.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Dec 10 2010 Jussi Lehtola - 4.4.1-1 +- Update to 4.4.1. + +* Wed Jul 21 2010 David Malcolm - 4.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Sat Jun 19 2010 Jussi Lehtola - 4.4.0-1 +- Update to 4.4.0. + +* Fri Oct 30 2009 Jussi Lehtola - 4.3.0-4 +- Keep time stamps also on binfiles. + +* Fri Oct 30 2009 Jussi Lehtola - 4.3.0-3 +- Added BR: python-devel. +- Added desktop file. + +* Fri Oct 30 2009 Jussi Lehtola - 4.3.0-2 +- Keep time stamps during sed of libraries. +- Changed BR: python-setuptools-devel to python-setuptools-devel. + +* Thu Oct 08 2009 Jussi Lehtola - 4.3.0-1 +- First release. From ecf787266e76a48f7dff05b86aeb83b37a64ccd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 29 Sep 2021 11:48:37 +0200 Subject: [PATCH 41/80] Version 5.6.5 (#1763697) --- PyMca.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index 9416dce..faa42a0 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,5 +1,5 @@ Name: PyMca -Version: 5.5.0 +Version: 5.6.5 Release: %autorelease Summary: X-ray Fluorescence Toolkit License: GPLv2+ diff --git a/sources b/sources index 04b4f1b..91a427a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pymca-5.5.0-filtered.tar.xz) = 83c325329605ee410cf2c1e296db261191d528bbe3a08ab4d33a6bd20700533b0e91592a4fc93b5d483ab7d85ed86f653f439d699895b7eea4073c4bdf59d95d +SHA512 (pymca-5.6.5-filtered.tar.xz) = 405168c108ab38c0fb161ae7ae68f97cdfe48a6150690796d3d47a521df0814228fd3cee88df46ffe88d64886dca5184bf6e35c2de5ba26af4990f71e40cdcf9 From fcf39904f3cffb3a2f7cc8cd26cb01647ae59859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 1 Dec 2021 09:31:17 +0100 Subject: [PATCH 42/80] Version 5.6.7 (#2027722) --- PyMca.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index faa42a0..6de789f 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,5 +1,5 @@ Name: PyMca -Version: 5.6.5 +Version: 5.6.7 Release: %autorelease Summary: X-ray Fluorescence Toolkit License: GPLv2+ diff --git a/sources b/sources index 91a427a..0c282cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pymca-5.6.5-filtered.tar.xz) = 405168c108ab38c0fb161ae7ae68f97cdfe48a6150690796d3d47a521df0814228fd3cee88df46ffe88d64886dca5184bf6e35c2de5ba26af4990f71e40cdcf9 +SHA512 (pymca-5.6.7-filtered.tar.xz) = 565b0524c5b56ed8d74f7f52b7b6aefa58770043786fdcee55e24c971901ab5f56f60b3bc54f63f2b059a8f7a95d22161d8f587361125dd55bf78b91d7c6cd2b From 53ff177fdf9c8dd42ec6fc2b259df1ae081a3463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 1 Dec 2021 10:22:27 +0100 Subject: [PATCH 43/80] Adjust dependencies and environment so that tests pass --- PyMca.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index 6de789f..01c7e56 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -28,13 +28,15 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: %py3_dist cython BuildRequires: %py3_dist numpy -BuildRequires: %py3_dist matplotlib +BuildRequires: %py3_dist h5py BuildRequires: %py3_dist pyqt5 BuildRequires: %py3_dist fisx +BuildRequires: %py3_dist matplotlib +BuildRequires: python3-matplotlib-qt5 BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel BuildRequires: qhull-devel -BuildRequires: %py3_dist h5py +BuildRequires: glibc-langpack-pl Requires: hicolor-icon-theme Requires: %{name}-data = %{version}-%{release} @@ -196,7 +198,8 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ PYMCA_DATA_DIR=%{buildroot}/usr/share/PyMca \ PYMCA_DOC_DIR=%{buildroot}/usr/share/doc/PyMca \ QT_QPA_PLATFORM=offscreen \ -%{__python3} PyMca5/tests/TestAll.py || : +LC_ALL=pl_PL.utf8 \ +%{__python3} PyMca5/tests/TestAll.py # Test results are ingored. In F34 rawhide mock: # ERROR: testHdf5Uri (ConfigDictTest.testConfigDict) From 97ee535aff0a9b39dcbf6ca4d2816482614582dc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 19:36:39 +0000 Subject: [PATCH 44/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering From c3ec082c4ba63277f45a24b947d97b2f52054134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 12 May 2022 09:39:08 +0200 Subject: [PATCH 45/80] Add explicit dependency on PyQt5 (rhbz#2084297) --- PyMca.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/PyMca.spec b/PyMca.spec index 01c7e56..345df58 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -39,6 +39,9 @@ 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: PyQt5 %description PyMCA provides a graphical interface for multi-channel analyzer spectra From 564708bfe058f48d7cdb9157db0dbf10e5700d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 12 May 2022 09:56:59 +0200 Subject: [PATCH 46/80] Tweak requires R are now in the same form as BR. --- PyMca.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index 345df58..f573e5d 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -26,12 +26,12 @@ 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 @@ -41,7 +41,8 @@ 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: PyQt5 +BuildRequires: python3dist(pyqt5) +BuildRequires: python3-matplotlib-qt5 %description PyMCA provides a graphical interface for multi-channel analyzer spectra From 46f504d28e0dacb6ad5df792f995f8e89382c792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 16 May 2022 13:25:18 +0200 Subject: [PATCH 47/80] Fix mixup between Requires and BuildRequires (#2084297) --- PyMca.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index f573e5d..87e47cf 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -41,8 +41,8 @@ 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. -BuildRequires: python3dist(pyqt5) -BuildRequires: python3-matplotlib-qt5 +Requires: python3dist(pyqt5) +Requires: python3-matplotlib-qt5 %description PyMCA provides a graphical interface for multi-channel analyzer spectra From cfe2b1aa916b13f0f8dce40aa2c571c8c0b4575a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 15 Jun 2022 13:24:55 +0200 Subject: [PATCH 48/80] Rebuilt for Python 3.11 From f2baa137aeb57fea17f42ba52836152e2dc1cc35 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 18:57:57 +0000 Subject: [PATCH 49/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From da510d16970bd6cee45203b522c3da98bfd7d5a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 22 Jul 2022 09:49:57 +0200 Subject: [PATCH 50/80] Modernize macros --- PyMca.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index 87e47cf..f2fbade 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -69,7 +69,7 @@ sed -i -e 's|"geom.h"||' \ PyMca5/Object3D/Object3DQhull/Object3DQhull.c # Fix wrong shebang of pymcapostbatch. -sed -i "s|!python|!%{__python3}|g" PyMca5/scripts/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/' @@ -101,8 +101,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 <%{buildroot}%{_datadir}/appdata/edfviewer.appdata.xml < @@ -113,7 +113,7 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/edfviewer.appdata.xml < EOF -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/elementsinfo.appdata.xml <%{buildroot}%{_datadir}/appdata/elementsinfo.appdata.xml < @@ -124,7 +124,7 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/elementsinfo.appdata.xml < EOF -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/mca2edf.appdata.xml <%{buildroot}%{_datadir}/appdata/mca2edf.appdata.xml < @@ -135,7 +135,7 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/mca2edf.appdata.xml < EOF -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/peakidentifier.appdata.xml <%{buildroot}%{_datadir}/appdata/peakidentifier.appdata.xml < @@ -146,7 +146,7 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/peakidentifier.appdata.xml < EOF -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/pymcabatch.appdata.xml <%{buildroot}%{_datadir}/appdata/pymcabatch.appdata.xml < @@ -157,7 +157,7 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/pymcabatch.appdata.xml < EOF -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/pymcapostbatch.appdata.xml <%{buildroot}%{_datadir}/appdata/pymcapostbatch.appdata.xml < @@ -168,7 +168,7 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/pymcapostbatch.appdata.xml < EOF -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/pymcaroitool.appdata.xml <%{buildroot}%{_datadir}/appdata/pymcaroitool.appdata.xml < @@ -203,7 +203,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 PyMca5/tests/TestAll.py # Test results are ingored. In F34 rawhide mock: # ERROR: testHdf5Uri (ConfigDictTest.testConfigDict) From cba5bac3a29131ab67ffa5a5d7b7631616e97c43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 22 Jul 2022 10:05:00 +0200 Subject: [PATCH 51/80] Version 5.7.2 --- PyMca.spec | 17 +++-------------- sources | 2 +- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index f2fbade..475d336 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,16 +1,17 @@ Name: PyMca -Version: 5.6.7 +Version: 5.7.2 Release: %autorelease Summary: X-ray Fluorescence Toolkit License: GPLv2+ 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 @@ -59,21 +60,9 @@ 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"||' \ - -e 's|"libqhull.h"||' \ - -e 's|"poly.h"||' \ - -e 's|"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/' - %build # Need to define manually. Note using pkg-config to export the cflags # is not identified by the setup.py script as it requires non-blank diff --git a/sources b/sources index 0c282cf..2b95328 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pymca-5.6.7-filtered.tar.xz) = 565b0524c5b56ed8d74f7f52b7b6aefa58770043786fdcee55e24c971901ab5f56f60b3bc54f63f2b059a8f7a95d22161d8f587361125dd55bf78b91d7c6cd2b +SHA512 (pymca-5.7.2-filtered.tar.xz) = 1ee1ac24d48795c6c182487563cdbfc9b5c476bf28f573dbc1f54179ce885f2532878a6aa050744d6bb24bceb244f60c40e35bf53eb1eda8072dd5284e913b1c From c43788124b9b10c80a151ff1502f5dae907dd223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 22 Jul 2022 13:49:05 +0200 Subject: [PATCH 52/80] Add patch to skip failing tests (rhbz#2098667) https://github.com/vasole/pymca/issues/889 --- PyMca.spec | 3 +++ testutils.diff | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 testutils.diff diff --git a/PyMca.spec b/PyMca.spec index 475d336..91c2bd8 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -22,6 +22,9 @@ Source5: peakidentifier.desktop Source6: pymcabatch.desktop Source7: pymcapostbatch.desktop Source8: pymcaroitool.desktop +# https://github.com/vasole/pymca/issues/889 +Patch: testutils.diff + BuildRequires: gcc BuildRequires: desktop-file-utils BuildRequires: ImageMagick diff --git a/testutils.diff b/testutils.diff new file mode 100644 index 0000000..13a007b --- /dev/null +++ b/testutils.diff @@ -0,0 +1,19 @@ +diff --git pymca-5.7.2/PyMca5/PyMcaGui/misc/testutils.py~ pymca-5.7.2/PyMca5/PyMcaGui/misc/testutils.py +index 04ae07461d..e5e9ef1d7f 100644 +--- pymca-5.7.2/PyMca5/PyMcaGui/misc/testutils.py~ ++++ pymca-5.7.2/PyMca5/PyMcaGui/misc/testutils.py +@@ -200,7 +200,13 @@ def setUp(self): + if hasattr(self, '_outcome'): + # For Python >= 3.4 + result = self.defaultTestResult() # these 2 methods have no side effects +- self._feedErrorsToResult(result, self._outcome.errors) ++ ++ if hasattr(self, '_feedErrorsToResult'): ++ # For Python < 3.11 ++ self._feedErrorsToResult(result, self._outcome.errors) ++ else: ++ # no idea what to do here ++ pass + else: + # For Python < 3.4 + result = getattr(self, '_outcomeForDoCleanups', self._resultForDoCleanups) From a86250f07440fd3871df10998bd6be0f682870fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 25 Jul 2022 12:57:17 +0200 Subject: [PATCH 53/80] Version 5.7.3 (rhbz#2109982) --- PyMca.spec | 4 +--- sources | 2 +- testutils.diff | 19 ------------------- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 testutils.diff diff --git a/PyMca.spec b/PyMca.spec index 91c2bd8..44cb431 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,5 +1,5 @@ Name: PyMca -Version: 5.7.2 +Version: 5.7.3 Release: %autorelease Summary: X-ray Fluorescence Toolkit License: GPLv2+ @@ -22,8 +22,6 @@ Source5: peakidentifier.desktop Source6: pymcabatch.desktop Source7: pymcapostbatch.desktop Source8: pymcaroitool.desktop -# https://github.com/vasole/pymca/issues/889 -Patch: testutils.diff BuildRequires: gcc BuildRequires: desktop-file-utils diff --git a/sources b/sources index 2b95328..782117c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pymca-5.7.2-filtered.tar.xz) = 1ee1ac24d48795c6c182487563cdbfc9b5c476bf28f573dbc1f54179ce885f2532878a6aa050744d6bb24bceb244f60c40e35bf53eb1eda8072dd5284e913b1c +SHA512 (pymca-5.7.3-filtered.tar.xz) = 15aaac7362112a8cd7577a6d5085cc1b71f022396548031dab1120c47dd187c1fbbfa5eb4410fc27f5a9cc96fc14d94e72d2f09a698386b1e9d6ec86689d04d8 diff --git a/testutils.diff b/testutils.diff deleted file mode 100644 index 13a007b..0000000 --- a/testutils.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff --git pymca-5.7.2/PyMca5/PyMcaGui/misc/testutils.py~ pymca-5.7.2/PyMca5/PyMcaGui/misc/testutils.py -index 04ae07461d..e5e9ef1d7f 100644 ---- pymca-5.7.2/PyMca5/PyMcaGui/misc/testutils.py~ -+++ pymca-5.7.2/PyMca5/PyMcaGui/misc/testutils.py -@@ -200,7 +200,13 @@ def setUp(self): - if hasattr(self, '_outcome'): - # For Python >= 3.4 - result = self.defaultTestResult() # these 2 methods have no side effects -- self._feedErrorsToResult(result, self._outcome.errors) -+ -+ if hasattr(self, '_feedErrorsToResult'): -+ # For Python < 3.11 -+ self._feedErrorsToResult(result, self._outcome.errors) -+ else: -+ # no idea what to do here -+ pass - else: - # For Python < 3.4 - result = getattr(self, '_outcomeForDoCleanups', self._resultForDoCleanups) From 3840e92ddc44be4b9c58a2acf539518b79f926a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 16 Aug 2022 20:20:12 +0200 Subject: [PATCH 54/80] Version 5.7.4 ... (rhbz#2113982) --- PyMca.spec | 4 +++- missing-triple-quote.diff | 11 +++++++++++ sources | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 missing-triple-quote.diff diff --git a/PyMca.spec b/PyMca.spec index 44cb431..dc94ba6 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,5 +1,5 @@ Name: PyMca -Version: 5.7.3 +Version: 5.7.4 Release: %autorelease Summary: X-ray Fluorescence Toolkit License: GPLv2+ @@ -23,6 +23,8 @@ Source6: pymcabatch.desktop Source7: pymcapostbatch.desktop Source8: pymcaroitool.desktop +Patch: missing-triple-quote.diff + BuildRequires: gcc BuildRequires: desktop-file-utils BuildRequires: ImageMagick diff --git a/missing-triple-quote.diff b/missing-triple-quote.diff new file mode 100644 index 0000000..901fded --- /dev/null +++ b/missing-triple-quote.diff @@ -0,0 +1,11 @@ +--- pymca-5.7.4/PyMca5/PyMcaPlugins/MedianFilterScanDeglitchPlugin.py~ 2022-08-02 11:00:19.000000000 +0200 ++++ pymca-5.7.4/PyMca5/PyMcaPlugins/MedianFilterScanDeglitchPlugin.py 2022-08-16 20:25:12.585485607 +0200 +@@ -43,7 +43,7 @@ + + + class MedianFilterScanDeglitchPlugin(Plugin1DBase.Plugin1DBase): +- '''Median-filter-based deglitching' ++ '''Median-filter-based deglitching''' + def __init__(self, plotWindow, **kw): + Plugin1DBase.Plugin1DBase.__init__(self, plotWindow, **kw) + self.methodDict = { diff --git a/sources b/sources index 782117c..a322703 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pymca-5.7.3-filtered.tar.xz) = 15aaac7362112a8cd7577a6d5085cc1b71f022396548031dab1120c47dd187c1fbbfa5eb4410fc27f5a9cc96fc14d94e72d2f09a698386b1e9d6ec86689d04d8 +SHA512 (pymca-5.7.4-filtered.tar.xz) = ea5fd8e5ab243d7afbea8483d9d72cc88a3f6f569eebe24bbdd30e0e0898bb7ac2297b4f29ee10b457385a1930bc0ee150663a8db161843422fc59e44cb265b3 From 695833b8ecbcd3402d7be7525823313fd167925d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 23 Aug 2022 19:32:29 +0200 Subject: [PATCH 55/80] Version 5.7.5 ... (rhbz#2119849) --- PyMca.spec | 4 +--- missing-triple-quote.diff | 11 ----------- sources | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 missing-triple-quote.diff diff --git a/PyMca.spec b/PyMca.spec index dc94ba6..3d2c9f1 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,5 +1,5 @@ Name: PyMca -Version: 5.7.4 +Version: 5.7.5 Release: %autorelease Summary: X-ray Fluorescence Toolkit License: GPLv2+ @@ -23,8 +23,6 @@ Source6: pymcabatch.desktop Source7: pymcapostbatch.desktop Source8: pymcaroitool.desktop -Patch: missing-triple-quote.diff - BuildRequires: gcc BuildRequires: desktop-file-utils BuildRequires: ImageMagick diff --git a/missing-triple-quote.diff b/missing-triple-quote.diff deleted file mode 100644 index 901fded..0000000 --- a/missing-triple-quote.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- pymca-5.7.4/PyMca5/PyMcaPlugins/MedianFilterScanDeglitchPlugin.py~ 2022-08-02 11:00:19.000000000 +0200 -+++ pymca-5.7.4/PyMca5/PyMcaPlugins/MedianFilterScanDeglitchPlugin.py 2022-08-16 20:25:12.585485607 +0200 -@@ -43,7 +43,7 @@ - - - class MedianFilterScanDeglitchPlugin(Plugin1DBase.Plugin1DBase): -- '''Median-filter-based deglitching' -+ '''Median-filter-based deglitching''' - def __init__(self, plotWindow, **kw): - Plugin1DBase.Plugin1DBase.__init__(self, plotWindow, **kw) - self.methodDict = { diff --git a/sources b/sources index a322703..c23ad6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pymca-5.7.4-filtered.tar.xz) = ea5fd8e5ab243d7afbea8483d9d72cc88a3f6f569eebe24bbdd30e0e0898bb7ac2297b4f29ee10b457385a1930bc0ee150663a8db161843422fc59e44cb265b3 +SHA512 (pymca-5.7.5-filtered.tar.xz) = c01a9b14a9ba72f5d251b0948093ff59d18b45cb88f65b63b0005e792e08e4e5bc8163031e49b66bb422334656eb0f975c4ce98143edbb5fcd55c756f68d832c From 1b12e38502291c35350052a8cfb4539ad8b62f57 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sun, 27 Nov 2022 20:51:45 +0100 Subject: [PATCH 56/80] Fix a C99 compatibility issue Related to: --- PyMca-c99.patch | 27 +++++++++++++++++++++++++++ PyMca.spec | 1 + 2 files changed, 28 insertions(+) create mode 100644 PyMca-c99.patch diff --git a/PyMca-c99.patch b/PyMca-c99.patch new file mode 100644 index 0000000..339a3ae --- /dev/null +++ b/PyMca-c99.patch @@ -0,0 +1,27 @@ +Avoid implicit ints for C99 compatibility. Submitted upstream: + + + +diff --git a/PyMca5/PyMcaIO/sps/Src/sps_lut.c b/PyMca5/PyMcaIO/sps/Src/sps_lut.c +index 6d335d28b7fcdf81..c925de30add98e8e 100644 +--- a/PyMca5/PyMcaIO/sps/Src/sps_lut.c ++++ b/PyMca5/PyMcaIO/sps/Src/sps_lut.c +@@ -1069,8 +1069,8 @@ void FillSegment(int pcbyteorder, XServer_Info Xservinfo, + unsigned int *CalcPalette (XServer_Info Xservinfo, int palette_type) + { + static unsigned int *full_palette = NULL; +- static old_type = -1; +- static old_mapbytes = -1; ++ static int old_type = -1; ++ static int old_mapbytes = -1; + unsigned int col; + int rbit, gbit, bbit, rshift, gshift, bshift, pcbyteorder; + swaptype val; +@@ -1190,6 +1190,7 @@ unsigned int *CalcPalette (XServer_Info Xservinfo, int palette_type) + return full_palette; + } + ++void + FillPalette (XServer_Info Xservinfo, + void *palette, int fmin, int fmax, + int palette_type, int meth, double gamma) diff --git a/PyMca.spec b/PyMca.spec index 3d2c9f1..4b968c2 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -22,6 +22,7 @@ Source5: peakidentifier.desktop Source6: pymcabatch.desktop Source7: pymcapostbatch.desktop Source8: pymcaroitool.desktop +Patch0: PyMca-c99.patch BuildRequires: gcc BuildRequires: desktop-file-utils From 8ecf7c5dbce946f15da3c33d688e7925963c6c57 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 20:02:17 +0000 Subject: [PATCH 57/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 3c2e5c50c0954a5e277499e999fd53b1a103596d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 21 Feb 2023 16:16:11 +0100 Subject: [PATCH 58/80] Version 5.8.1 ... (rhbz#2143705) --- PyMca-c99.patch | 27 --------------------------- PyMca.spec | 3 +-- sources | 2 +- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 PyMca-c99.patch diff --git a/PyMca-c99.patch b/PyMca-c99.patch deleted file mode 100644 index 339a3ae..0000000 --- a/PyMca-c99.patch +++ /dev/null @@ -1,27 +0,0 @@ -Avoid implicit ints for C99 compatibility. Submitted upstream: - - - -diff --git a/PyMca5/PyMcaIO/sps/Src/sps_lut.c b/PyMca5/PyMcaIO/sps/Src/sps_lut.c -index 6d335d28b7fcdf81..c925de30add98e8e 100644 ---- a/PyMca5/PyMcaIO/sps/Src/sps_lut.c -+++ b/PyMca5/PyMcaIO/sps/Src/sps_lut.c -@@ -1069,8 +1069,8 @@ void FillSegment(int pcbyteorder, XServer_Info Xservinfo, - unsigned int *CalcPalette (XServer_Info Xservinfo, int palette_type) - { - static unsigned int *full_palette = NULL; -- static old_type = -1; -- static old_mapbytes = -1; -+ static int old_type = -1; -+ static int old_mapbytes = -1; - unsigned int col; - int rbit, gbit, bbit, rshift, gshift, bshift, pcbyteorder; - swaptype val; -@@ -1190,6 +1190,7 @@ unsigned int *CalcPalette (XServer_Info Xservinfo, int palette_type) - return full_palette; - } - -+void - FillPalette (XServer_Info Xservinfo, - void *palette, int fmin, int fmax, - int palette_type, int meth, double gamma) diff --git a/PyMca.spec b/PyMca.spec index 4b968c2..e9a9e49 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,5 +1,5 @@ Name: PyMca -Version: 5.7.5 +Version: 5.8.1 Release: %autorelease Summary: X-ray Fluorescence Toolkit License: GPLv2+ @@ -22,7 +22,6 @@ Source5: peakidentifier.desktop Source6: pymcabatch.desktop Source7: pymcapostbatch.desktop Source8: pymcaroitool.desktop -Patch0: PyMca-c99.patch BuildRequires: gcc BuildRequires: desktop-file-utils diff --git a/sources b/sources index c23ad6f..4ea9cba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pymca-5.7.5-filtered.tar.xz) = c01a9b14a9ba72f5d251b0948093ff59d18b45cb88f65b63b0005e792e08e4e5bc8163031e49b66bb422334656eb0f975c4ce98143edbb5fcd55c756f68d832c +SHA512 (pymca-5.8.1-filtered.tar.xz) = 7d206c0a3c3f1cf3063e0dcd8fd63d6d782d08a443983b199f81b1c3a4dd18183a49a8e771b7712ed04de46fe842b063771599ae63ab5a846a23f215bb6bdc40 From 7ab1a888b393a6d5f0956556abf3c14caa2ca0d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 20 May 2023 17:32:43 +0200 Subject: [PATCH 59/80] Version 5.8.2 ... (rhbz#2207560) --- PyMca.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index e9a9e49..0f42828 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,5 +1,5 @@ Name: PyMca -Version: 5.8.1 +Version: 5.8.2 Release: %autorelease Summary: X-ray Fluorescence Toolkit License: GPLv2+ diff --git a/sources b/sources index 4ea9cba..4c52da0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pymca-5.8.1-filtered.tar.xz) = 7d206c0a3c3f1cf3063e0dcd8fd63d6d782d08a443983b199f81b1c3a4dd18183a49a8e771b7712ed04de46fe842b063771599ae63ab5a846a23f215bb6bdc40 +SHA512 (pymca-5.8.2-filtered.tar.xz) = 0e55bab83ad2fc0f44eaf5a7da268c210d0e18a4c51297a59cad25205421784d997fcc232c385e128e3fd48351d89313040385cb22ac5a00410a5cf85057c1ba From bdecdcb5fa0b1e0e4f9b9f2c9f531a6251b4f822 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 12 Jul 2023 09:27:16 +0200 Subject: [PATCH 60/80] Rebuilt for Python 3.12 From 406ba438d88c54c3d2e525ef6b7cfc4870dcdee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 16 Jul 2023 15:34:00 +0200 Subject: [PATCH 61/80] Version 5.8.7 ... (rhbz#2213795) --- PyMca.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index 0f42828..660bc15 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,5 +1,5 @@ Name: PyMca -Version: 5.8.2 +Version: 5.8.7 Release: %autorelease Summary: X-ray Fluorescence Toolkit License: GPLv2+ diff --git a/sources b/sources index 4c52da0..2373677 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pymca-5.8.2-filtered.tar.xz) = 0e55bab83ad2fc0f44eaf5a7da268c210d0e18a4c51297a59cad25205421784d997fcc232c385e128e3fd48351d89313040385cb22ac5a00410a5cf85057c1ba +SHA512 (pymca-5.8.7-filtered.tar.xz) = 0727631f9d53d9e52e7da9afccb1124143dc19b4f674fbb0a2b4bde722663f5743665a9b078af162fdcf98074e4978c2cc26a933ecead49035fc68d3d65000e3 From cea1e774c571ca54ee6014caa96dbf08db89c7bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 11:23:42 +0000 Subject: [PATCH 62/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 2627580a2cc2b2150483a28519d506c55d899929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 6 Aug 2023 12:00:41 +0200 Subject: [PATCH 63/80] Version 5.8.9 ... (rhbz#2228541) --- PyMca.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index 660bc15..33fb3f7 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,5 +1,5 @@ Name: PyMca -Version: 5.8.7 +Version: 5.8.9 Release: %autorelease Summary: X-ray Fluorescence Toolkit License: GPLv2+ diff --git a/sources b/sources index 2373677..4cda28a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pymca-5.8.7-filtered.tar.xz) = 0727631f9d53d9e52e7da9afccb1124143dc19b4f674fbb0a2b4bde722663f5743665a9b078af162fdcf98074e4978c2cc26a933ecead49035fc68d3d65000e3 +SHA512 (pymca-5.8.9-filtered.tar.xz) = 3e78b413e22e45eacdfd57727a6613e7a7c9f63fed9637690ed6235d8af43a5384d6e402456cada63d1602e9d32c913f5f8b0af572ef3937b810c108e058a981 From 4eb83ba54a0adab4652e855b3c592cdfb17d3224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 2 Sep 2023 10:58:19 +0300 Subject: [PATCH 64/80] Version 5.9.0 ... (rhbz#2233556) --- PyMca.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index 33fb3f7..f7df031 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,5 +1,5 @@ Name: PyMca -Version: 5.8.9 +Version: 5.9.0 Release: %autorelease Summary: X-ray Fluorescence Toolkit License: GPLv2+ diff --git a/sources b/sources index 4cda28a..959c99d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pymca-5.8.9-filtered.tar.xz) = 3e78b413e22e45eacdfd57727a6613e7a7c9f63fed9637690ed6235d8af43a5384d6e402456cada63d1602e9d32c913f5f8b0af572ef3937b810c108e058a981 +SHA512 (pymca-5.9.0-filtered.tar.xz) = 1cba2d55da583a79aa09e7603f2a84fa308e248cfb2223f9bf1f4eb637b3e836260bb956716bc6a2e5139e4efa50f0ff5141b875c64080de8a751f967124e154 From aba64eb342521dafc2f48293da7a4ea4895c8987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 28 Sep 2023 13:32:57 +0200 Subject: [PATCH 65/80] Version 5.9.1 ... (rhbz#2240987) --- PyMca.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index f7df031..1d60180 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,5 +1,5 @@ Name: PyMca -Version: 5.9.0 +Version: 5.9.1 Release: %autorelease Summary: X-ray Fluorescence Toolkit License: GPLv2+ diff --git a/sources b/sources index 959c99d..3d903db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pymca-5.9.0-filtered.tar.xz) = 1cba2d55da583a79aa09e7603f2a84fa308e248cfb2223f9bf1f4eb637b3e836260bb956716bc6a2e5139e4efa50f0ff5141b875c64080de8a751f967124e154 +SHA512 (pymca-5.9.1-filtered.tar.xz) = e5b9da20bd2b02b9a36c3b6eb8dd6c294b45fa1c361f53eec4cf4e1eaddf7fd10067fcff895380f2747e457c22f8babd135e871b51f05585b43de115bd29fad0 From 6b2f96abc7ae8aae41fec51dfd561fb79e6af955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 21 Nov 2023 14:41:20 +0100 Subject: [PATCH 66/80] Convert license tag to SPDX --- PyMca.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 1d60180..1918862 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -2,7 +2,7 @@ Name: PyMca Version: 5.9.1 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 From f46dfaf046f25d5142380a488882ea8455d18a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 17 Dec 2023 17:50:32 +0100 Subject: [PATCH 67/80] Version 7.2.0 ... (rhbz#2252290) --- PyMca.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PyMca.spec b/PyMca.spec index 1918862..22cd87f 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,5 +1,5 @@ Name: PyMca -Version: 5.9.1 +Version: 5.9.2 Release: %autorelease Summary: X-ray Fluorescence Toolkit License: GPL-2.0-or-later diff --git a/sources b/sources index 3d903db..518528a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pymca-5.9.1-filtered.tar.xz) = e5b9da20bd2b02b9a36c3b6eb8dd6c294b45fa1c361f53eec4cf4e1eaddf7fd10067fcff895380f2747e457c22f8babd135e871b51f05585b43de115bd29fad0 +SHA512 (pymca-5.9.2-filtered.tar.xz) = a33684ca3a43985e34acf79d2db289ac41c2b59dc965ff88135b4a14440ebf7e073c61e5701e6b1380586290ed0eed33d1ab132f0a5148ad1558f8a45eb7516a From 7ac872af9d0156962c5b26a35fe40a133b43a5c1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 10:14:48 +0000 Subject: [PATCH 68/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 49ad31867f96e3670aefafccf83d40b8eaba4e44 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 21:12:04 +0000 Subject: [PATCH 69/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 53323acea304fc415906d33933ead26967825b2b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 20:58:05 +0200 Subject: [PATCH 70/80] 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 71/80] 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 72/80] 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 73/80] 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 74/80] 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 75/80] 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 76/80] 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 77/80] 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 78/80] 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 79/80] 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 80/80] Rebuilt for Python 3.14.0rc3 bytecode