diff --git a/.gitignore b/.gitignore index d0e2141..ffa3a17 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ -pymca4.4.0-src.tgz -/pymca4.4.1-src.tgz -/pymca4.4.1p1-src.tgz -/pymca4.5.0-src.tgz +/pymca-*.tar.xz +*~ +/x86_64/ +/noarch/ +/.build*.log +/pymca-*/ diff --git a/PyMca.desktop b/PyMca.desktop index 493c7c6..09d1806 100644 --- a/PyMca.desktop +++ b/PyMca.desktop @@ -1,8 +1,9 @@ [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 Terminal=false Type=Application Categories=Education;Science;DataVisualization;Physics; diff --git a/PyMca.spec b/PyMca.spec index 01c2826..50d2f1a 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,134 +1,227 @@ -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +Name: PyMca +Version: 5.9.4 +Release: %autorelease +Summary: X-ray Fluorescence Toolkit +License: GPL-2.0-or-later +URL: http://pymca.sourceforge.net/ +# https://github.com/vasole/pymca +%if 0 +Original source: http://downloads.sourceforge.net/sourceforge/pymca/pymca%%{version}-src.tgz +However it bundles a copy of the "sift" module which implements a patented algorithm. +The algorithm can be used for non-commercial research purposes ONLY. Per: +http://fedoraproject.org/wiki/Packaging:SourceURL#When_Upstream_uses_Prohibited_Code +we must remove them before uploading: + ./getsources.sh [%{version}] +%endif +Source0: pymca-%{version}-filtered.tar.xz +Source1: PyMca.desktop +Source2: edfviewer.desktop +Source3: elementsinfo.desktop +Source4: mca2edf.desktop +Source5: peakidentifier.desktop +Source6: pymcabatch.desktop +Source7: pymcapostbatch.desktop +Source8: pymcaroitool.desktop -%{?filter_setup: -%filter_provides_in %{python_sitearch}.*\.so$ -%filter_setup -} - -Name: PyMca -Version: 4.5.0 -Release: 1%{?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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -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 +BuildRequires: gcc +BuildRequires: desktop-file-utils +BuildRequires: ImageMagick +BuildRequires: python3-devel +BuildRequires: python3-setuptools +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 +BuildRequires: qhull-devel +BuildRequires: glibc-langpack-pl +Requires: hicolor-icon-theme +Requires: %{name}-data = %{version}-%{release} +# Dependency on the graphical toolkit is not autogenerated because many different +# ones are supported, https://bugzilla.redhat.com/show_bug.cgi?id=2084297. +Requires: python3dist(pyqt5) +Requires: python3-matplotlib-qt5 %description -PyMCA provides a graphical interface for multi-channel 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 + +%description data +This package contains photon interaction data/elements data for %{name}. + %prep -%setup -q -n %{name}%{version} -# 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 +%autosetup -p1 -n pymca-%{version} +sed -r -i 's|(os.path.join.")(PyMca5")|\1src/\2|' setup.py %build -# setup.py asks for license approval -echo yes | python setup.py 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}/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 -rm -rf %{buildroot} -# setup.py asks for license approval -echo yes | python setup.py install -O1 --skip-build --root %{buildroot} +PYMCA_DATA_DIR=/usr/share/PyMca \ +PYMCA_DOC_DIR=/usr/share/doc/PyMca \ +%py3_install -# Install desktop file -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} +cp -ap src/PyMca5/PyMcaData/attdata/* %{buildroot}%{_datadir}/PyMca/attdata/ -# 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 +# 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} + +# Merge applications into one software center item +mkdir -p %{buildroot}%{_datadir}/appdata +cat >%{buildroot}%{_datadir}/appdata/edfviewer.appdata.xml < + + + CC0-1.0 + edfviewer.desktop + + PyMca.desktop + + +EOF +cat >%{buildroot}%{_datadir}/appdata/elementsinfo.appdata.xml < + + + CC0-1.0 + elementsinfo.desktop + + PyMca.desktop + + +EOF +cat >%{buildroot}%{_datadir}/appdata/mca2edf.appdata.xml < + + + CC0-1.0 + mca2edf.desktop + + PyMca.desktop + + +EOF +cat >%{buildroot}%{_datadir}/appdata/peakidentifier.appdata.xml < + + + CC0-1.0 + peakidentifier.desktop + + PyMca.desktop + + +EOF +cat >%{buildroot}%{_datadir}/appdata/pymcabatch.appdata.xml < + + + CC0-1.0 + pymcabatch.desktop + + PyMca.desktop + + +EOF +cat >%{buildroot}%{_datadir}/appdata/pymcapostbatch.appdata.xml < + + + CC0-1.0 + pymcapostbatch.desktop + + PyMca.desktop + + +EOF +cat >%{buildroot}%{_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 \ + %{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}%{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}%{python_sitearch}/PyMca/*.py; do - sed '/\/usr\/bin\/env/d' $lib > $lib.new && - touch -r $lib $lib.new && - mv $lib.new $lib -done +# Get rid of /usr/bin/env in libraries. +find %{buildroot}%{python3_sitearch}/PyMca5 -type f -name '*.py' \ + -exec sed -i '/\/usr\/bin\/env/d' {} + \ + -exec touch -r setup.py {} + -%clean -rm -rf %{buildroot} +%check +PYTHONPATH=%{buildroot}%{python3_sitearch} \ +PYMCA_DATA_DIR=%{buildroot}/usr/share/PyMca \ +PYMCA_DOC_DIR=%{buildroot}/usr/share/doc/PyMca \ +QT_QPA_PLATFORM=offscreen \ +LC_ALL=pl_PL.utf8 \ +%python3 src/PyMca5/tests/TestAll.py + +# 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 -%defattr(-,root,root,-) -%doc LICENSE.GPL README -%{python_sitearch}/PyMca/ -%{python_sitearch}/PyMca-%{version}-py*.egg-info +%license LICENSE.GPL +%doc changelog.txt README.rst %{_bindir}/edfviewer %{_bindir}/elementsinfo %{_bindir}/mca2edf %{_bindir}/peakidentifier %{_bindir}/pymca* %{_bindir}/rgbcorrelator -%{_datadir}/applications/PyMca.desktop +%{_datadir}/appdata/*.appdata.xml +%{_datadir}/applications/*.desktop +%{_datadir}/icons/hicolor/*x*/apps/%{name}.png +%{_mandir}/man1/*.1* +%{python3_sitearch}/PyMca5/ +%{python3_sitearch}/PyMca5-%{version}-py%{python3_version}.egg-info +%exclude %{_pkgdocdir} + +%files data +%{_datadir}/%{name}/ +%{_pkgdocdir}/ %changelog -* 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..9c3d896 --- /dev/null +++ b/changelog @@ -0,0 +1,222 @@ +* 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 + +* 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. 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/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/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..81ef8da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a624a37cee7d8cc916b33f3759429cc4 pymca4.5.0-src.tgz +SHA512 (pymca-5.9.4-filtered.tar.xz) = 08304ccfda672aa7fe9075eb72a17d5a12c72924c15546c0706435970d754e8dcf75870bdac99509a52d539e5f6d8cc42131bae823d9c0cbda688e4b5dfa39f4