SHA256
1
0
forked from pool/python38

- Fix idle to be co-installable

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python38?expand=0&rev=8
This commit is contained in:
Tomáš Chvátal 2020-07-10 09:35:42 +00:00 committed by Git OBS Bridge
parent 1c51f99915
commit 1553080af8
2 changed files with 26 additions and 14 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jul 10 09:35:29 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Fix idle to be co-installable
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 10 08:44:54 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com> Fri Jul 10 08:44:54 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>

View File

@ -589,27 +589,34 @@ done
# Idle is not packaged in base due to the appstream-glib dependency # Idle is not packaged in base due to the appstream-glib dependency
# move idle config into /etc # move idle config into /etc
install -d -m 755 %{buildroot}%{_sysconfdir}/idle3 install -d -m 755 %{buildroot}%{_sysconfdir}/idle%{python_version}
( (
cd %{buildroot}/%{sitedir}/idlelib/ cd %{buildroot}/%{sitedir}/idlelib/
for file in *.def ; do for file in *.def ; do
mv $file %{buildroot}%{_sysconfdir}/idle3/ mv $file %{buildroot}%{_sysconfdir}/idle%{python_version}/
ln -sf %{_sysconfdir}/idle3/$file %{buildroot}/%{sitedir}/idlelib/ ln -sf %{_sysconfdir}/idle%{python_version}/$file %{buildroot}/%{sitedir}/idlelib/
done done
) )
# keep just idle3.X
rm %{buildroot}%{_bindir}/idle3
# install idle icons # install idle icons
for size in 16 32 48 ; do for size in 16 32 48 ; do
install -m 644 -D Lib/idlelib/Icons/idle_${size}.png \ install -m 644 -D Lib/idlelib/Icons/idle_${size}.png \
%{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/idle3.png %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/idle%{python_version}.png
done done
# install idle desktop file # install idle desktop file
install -m 644 -D -t %{buildroot}%{_datadir}/applications %{SOURCE19} cp %{SOURCE19} idle%{python_version}.desktop
%suse_update_desktop_file idle3 sed -i -e 's:idle3:idle%{python_version}:g' idle%{python_version}.desktop
install -m 644 -D -t %{buildroot}%{_datadir}/applications idle%{python_version}.desktop
%suse_update_desktop_file idle%{python_version}
install -m 644 -D -t %{buildroot}%{_datadir}/metainfo %{SOURCE20} cp %{SOURCE20} idle%{python_version}.appdata.xml
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/idle3.appdata.xml sed -i -e 's:idle3.desktop:idle%{python_version}.desktop:g' idle%{python_version}.appdata.xml
install -m 644 -D -t %{buildroot}%{_datadir}/metainfo idle%{python_version}.appdata.xml
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/idle%{python_version}.appdata.xml
%fdupes %{buildroot}/%{_libdir}/python%{python_version} %fdupes %{buildroot}/%{_libdir}/python%{python_version}
%endif %endif
@ -723,17 +730,17 @@ echo %{sitedir}/_import_failed > %{buildroot}/%{sitedir}/site-packages/zzzz-impo
%files -n %{python_pkg_name}-idle %files -n %{python_pkg_name}-idle
%defattr(644, root, root, 755) %defattr(644, root, root, 755)
%{sitedir}/idlelib %{sitedir}/idlelib
%dir %{_sysconfdir}/idle3 %dir %{_sysconfdir}/idle%{python_version}
%config %{_sysconfdir}/idle3/* %config %{_sysconfdir}/idle%{python_version}/*
%doc Lib/idlelib/NEWS.txt %doc Lib/idlelib/NEWS.txt
%doc Lib/idlelib/README.txt %doc Lib/idlelib/README.txt
%doc Lib/idlelib/TODO.txt %doc Lib/idlelib/TODO.txt
%doc Lib/idlelib/extend.txt %doc Lib/idlelib/extend.txt
%doc Lib/idlelib/ChangeLog %doc Lib/idlelib/ChangeLog
%{_bindir}/idle3 %{_bindir}/idle%{python_version}
%{_datadir}/applications/idle3.desktop %{_datadir}/applications/idle%{python_version}.desktop
%{_datadir}/metainfo/idle3.appdata.xml %{_datadir}/metainfo/idle%{python_version}.appdata.xml
%{_datadir}/icons/hicolor/*/apps/idle3.png %{_datadir}/icons/hicolor/*/apps/idle%{python_version}.png
%dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor
%dir %{_datadir}/icons/hicolor/16x16 %dir %{_datadir}/icons/hicolor/16x16
%dir %{_datadir}/icons/hicolor/32x32 %dir %{_datadir}/icons/hicolor/32x32