From 87dab76d59895dde82a20a04cc76303ac873ea974a71cee9f88c3ce701a66e60 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 20 Feb 2024 22:10:13 +0000 Subject: [PATCH] =?UTF-8?q?-=20Switch=20to=20%%autopatch.=20Let=E2=80=99s?= =?UTF-8?q?=20try=20it=20as=20an=20experiment,=20and=20if=20we=20=20=20nee?= =?UTF-8?q?d=20conditional=20patch,=20we=20should=20put=20condition=20insi?= =?UTF-8?q?de=20of=20it.=20-=20Remove=20double=20definition=20of=20/usr/bi?= =?UTF-8?q?n/idle%%{version}=20in=20=20=20%%files.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python312?expand=0&rev=37 --- python312.changes | 8 ++++++++ python312.spec | 16 +--------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/python312.changes b/python312.changes index 9d306c4..b95e91a 100644 --- a/python312.changes +++ b/python312.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Feb 20 18:12:05 UTC 2024 - Matej Cepl + +- Switch to %%autopatch. Let’s try it as an experiment, and if we + need conditional patch, we should put condition inside of it. +- Remove double definition of /usr/bin/idle%%{version} in + %%files. + ------------------------------------------------------------------- Thu Feb 15 10:29:07 UTC 2024 - Daniel Garcia diff --git a/python312.spec b/python312.spec index aeb63d0..80748f1 100644 --- a/python312.spec +++ b/python312.spec @@ -418,20 +418,7 @@ other applications. %prep %setup -q -n %{tarname} -%patch -P 07 -p1 -%patch -P 08 -p1 -%patch -P 09 -p1 -%patch -P 15 -p1 -%patch -P 29 -p1 -# %%if 0%%{?suse_version} <= 1500 -%patch -P 33 -p1 -# %%endif -# %%if 0%%{?sle_version} && 0%%{?sle_version} <= 150300 -%patch -P 34 -p1 -# %%endif -%patch -P 35 -p1 -%patch -P 36 -p1 -%patch -P 37 -p1 +%autopatch -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac @@ -820,7 +807,6 @@ echo %{sitedir}/_import_failed > %{buildroot}/%{sitedir}/site-packages/zzzz-impo %dir %{_datadir}/icons/hicolor/32x32 %dir %{_datadir}/icons/hicolor/48x48 %dir %{_datadir}/icons/hicolor/*/apps -%attr(755, root, root) %{_bindir}/idle%{python_version} # endif for if general %endif