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 aa096e2..50d2f1a 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -1,23 +1,19 @@ -# 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: 4%{?dist} -Summary: PyMca X-ray Fluorescence Toolkit -License: GPLv2+ +Version: 5.9.4 +Release: %autorelease +Summary: X-ray Fluorescence Toolkit +License: GPL-2.0-or-later 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 +# 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 @@ -26,86 +22,64 @@ 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 -%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: 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: PyQwt BuildRequires: qhull-devel +BuildRequires: glibc-langpack-pl 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} +# 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 -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 +%autosetup -p1 -n pymca-%{version} -# 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 +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 # 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_CFLAGS="-I%{_includedir}/libqhull" \ QHULL_LIBS="-lqhull" \ SPECFILE_USE_GNU_SOURCE=1 \ -%if 0%{?with_python3} -%{__python3} setup.py build -%else -%{__python2} setup.py build -%endif +PYMCA_DATA_DIR=/usr/share/PyMca \ +PYMCA_DOC_DIR=/usr/share/doc/PyMca \ +%py3_build %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 +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} @@ -118,8 +92,8 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:7} desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:8} # Merge applications into one software center item -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/edfviewer.appdata.xml <%{buildroot}%{_datadir}/appdata/edfviewer.appdata.xml < @@ -130,7 +104,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 < @@ -141,7 +115,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 < @@ -152,7 +126,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 < @@ -163,7 +137,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 < @@ -174,7 +148,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 < @@ -185,7 +159,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 < @@ -206,50 +180,31 @@ 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 +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. -%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 +find %{buildroot}%{python3_sitearch}/PyMca5 -type f -name '*.py' \ + -exec sed -i '/\/usr\/bin\/env/d' {} + \ + -exec touch -r setup.py {} + %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 +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 -%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 || : +# 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 -%doc changelog.txt LICENSE.GPL README +%license LICENSE.GPL +%doc changelog.txt README.rst %{_bindir}/edfviewer %{_bindir}/elementsinfo %{_bindir}/mca2edf @@ -260,82 +215,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_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}/ +%{python3_sitearch}/PyMca5/ +%{python3_sitearch}/PyMca5-%{version}-py%{python3_version}.egg-info +%exclude %{_pkgdocdir} %files data %{_datadir}/%{name}/ %{_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 - -* 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..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/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..81ef8da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a7ee68844591e15b1b65738f58929fb8 pymca4.7.3-src-clean.tgz +SHA512 (pymca-5.9.4-filtered.tar.xz) = 08304ccfda672aa7fe9075eb72a17d5a12c72924c15546c0706435970d754e8dcf75870bdac99509a52d539e5f6d8cc42131bae823d9c0cbda688e4b5dfa39f4