diff --git a/.gitignore b/.gitignore index 7c19c59..32ae6e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,5 @@ /eric-32.png /eric-48.png /eric-64.png -/eric6-18.08.tar.gz -/eric6-i18n-de-18.08.tar.gz -/eric6-i18n-en-18.08.tar.gz -/eric6-i18n-es-18.08.tar.gz -/eric6-i18n-ru-18.08.tar.gz -/eric6-18.12.tar.gz -/eric6-i18n-de-18.12.tar.gz -/eric6-i18n-en-18.12.tar.gz -/eric6-i18n-es-18.12.tar.gz -/eric6-i18n-ru-18.12.tar.gz -/eric6-20.1.tar.gz -/eric6-i18n-de-20.1.tar.gz -/eric6-i18n-en-20.1.tar.gz -/eric6-i18n-es-20.1.tar.gz -/eric6-i18n-ru-20.1.tar.gz -/eric7-23.9.tar.gz +/eric6-*.tar.gz +/eric7-*.tar.gz diff --git a/eric.spec b/eric.spec index 872c6ba..fe55930 100644 --- a/eric.spec +++ b/eric.spec @@ -7,7 +7,7 @@ Name: eric Summary: Python IDE -Version: 23.9 +Version: 24.3 Release: %autorelease License: GPLv3+ @@ -61,7 +61,7 @@ Requires: python3dist(tomlkit) Requires: python3dist(trove-classifiers) Requires: python3dist(wheel) Recommends: python3-docs -Recommends: qt5-qtdoc +Recommends: qt6-doc-html Recommends: qt6-qttranslations %description @@ -87,13 +87,14 @@ eric7 is a full featured Python IDE. install -m644 -p -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/eric.png install -m644 -p -D %{SOURCE32} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/eric.png -%find_lang %{name} --with-qt --all-name +# non-standard category +desktop-file-edit --remove-category=MicroPython %{buildroot}%{_datadir}/applications/eric7_mpy.desktop -## toplevel __pycache__ creation is ... inconsistent -## rawhide makes one, f23 local builds do not, so let's *make* it consistent -mkdir -p %{buildroot}%{python3_sitelib}/__pycache__/exclude_rpm_hack +%find_lang %{name} --with-qt --all-name ## unpackaged files +# duplicate file +rm -fv %{buildroot}%{_datadir}/appdata/eric7.appdata.xml # deprecated icons rm -rfv %{buildroot}%{_datadir}/icons/eric* rm -fv %{buildroot}%{python3_sitelib}/eric7/LICENSE.txt @@ -103,11 +104,12 @@ sed -i -e 's|-i %{buildroot}/||' %{buildroot}%{python3_sitelib}/eric7/eric7insta %check %if 0%{?fedora} -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/eric7.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/eric7.appdata.xml %endif test "$(grep '^Exec' %{buildroot}%{_datadir}/applications/eric7_ide.desktop)" = "Exec=%{_bindir}/eric7_ide" desktop-file-validate %{buildroot}%{_datadir}/applications/eric7_browser.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/eric7_ide.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/eric7_mpy.desktop %files -f %{name}.lang @@ -115,23 +117,21 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/eric7_ide.desktop %doc eric/docs/THANKS %license eric/docs/LICENSE.txt %{_bindir}/eric7* -%{python3_sitelib}/eric7config.py* -%{python3_sitelib}/__pycache__/* -%exclude %{python3_sitelib}/__pycache__/exclude_rpm_hack +%pycached %{python3_sitelib}/eric7config.py %dir %{python3_sitelib}/eric7/ -%{python3_sitelib}/eric7/*.py* -%{python3_sitelib}/eric7/__pycache__/ +%pycached %{python3_sitelib}/eric7/*.py +%exclude %{python3_sitelib}/eric7/*.pyw %{python3_sitelib}/eric7/icons/ %{python3_sitelib}/eric7/pixmaps/ %{python3_sitelib}/eric7/[A-Z]*/ -%{python3_sitelib}/eric7/*.e4k %{python3_sitelib}/eric7/*.ekj %{python3_sitelib}/eric7/*.json %dir %{python3_sitelib}/eric7/i18n/ %{python3_sitelib}/eric7plugins/ -%{_datadir}/metainfo/eric7.appdata.xml +%{_metainfodir}/eric7.appdata.xml %{_datadir}/applications/eric7_browser.desktop %{_datadir}/applications/eric7_ide.desktop +%{_datadir}/applications/eric7_mpy.desktop %{_datadir}/icons/hicolor/*/apps/eric* %{_datadir}/qt6/qsci/api/MicroPython/ %{_datadir}/qt6/qsci/api/Python3/ diff --git a/sources b/sources index 3923049..5750243 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (eric-32.png) = 50dba45cb0a01f47c579db85875e890fac84eaddf9df427991bd84150d214f3d1fa28c65742e9cb56ae216e79e88ef2c952ebf243ade0347763ea991ed78d8d3 SHA512 (eric-48.png) = d36c7388805d52b6c2c48cbf80222ba285dee4c9e923bb0d629c1832acf51da059ef89397b4b4efa429727c8d7c5c73893a9da2ac0c68feea51c9131d3d2ef55 SHA512 (eric-64.png) = be0367a883cd026c2b6da7484c859ffe8f79d53cd5f4364c062eebb7337de38d446c851e63c8927485c9d95fc91cc5d8d4c60bd0cddfb478313820ebcbdfcb57 -SHA512 (eric7-23.9.tar.gz) = a18696108767d7fc7491b10d262ceb8013e38d749b0bce2bd5efb0c5da73569d866aa85a000331984bbc3d98aeca1fe8609f8e1477face556b3fda12db58023b +SHA512 (eric7-24.3.tar.gz) = f7250f73320e098360a5c568bc2670cb73fadcb96f4a3a83ae67e3c5934ed9fa1419a5557f3a9416144beeac0358185ad536149c6e3c650b502d90ced9ef742f