From 44546704eea0ba08aeabc81f3a4e7b2df7f65925 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Fri, 15 Mar 2024 12:03:43 -0400 Subject: [PATCH] brp python --- root/etc/yum.smerepos.d/.gitignore | 0 smeserver-yum.spec | 25 +++++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 root/etc/yum.smerepos.d/.gitignore diff --git a/root/etc/yum.smerepos.d/.gitignore b/root/etc/yum.smerepos.d/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/smeserver-yum.spec b/smeserver-yum.spec index 506166a..bf00bec 100644 --- a/smeserver-yum.spec +++ b/smeserver-yum.spec @@ -4,7 +4,7 @@ Summary: YUM, an rpm updater Name: %{name} %define version 2.6.2 -%define release 7 +%define release 8 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -30,17 +30,21 @@ Requires: yum-plugin-post-transaction-actions Requires: mailx Requires: deltarpm Requires: yum-cron -BuildRequires: e-smith-devtools >= 1.13.1-03 -BuildRequires: python27 python3 +BuildRequires: smeserver-devtools >= 2.6.0-20 +BuildRequires: python3 Conflicts: centos-yumconf AutoReqProv: no + +# Disable automatic bytecompilation. The python3 binary is not yet be +# available in /usr/bin when Python is built. Also, the bytecompilation fails +# on files that test invalid syntax. +%undefine py_auto_byte_compile + %description %name is an implementation of http://linux.duke.edu/projects/yum on SME Server %prep %setup -rm -rf root/var/service/ root/service/ -rm -rf root/etc/e-smith/db/configuration/force %build perl createlinks @@ -68,16 +72,13 @@ mkdir -p root/etc/yum.smerepos.d %defattr(-,root,root) %pre -if [ $1 -gt 1 ] ; then - if [ -e /var/service/yum/run ] ; then - /usr/bin/sv d yum - /usr/bin/sv d yum/log - fi -fi %changelog -* Thu Mar 14 2024 Jean-Philippe Pialasse 2.6.2-6.sme +* Fri Mar 15 2024 Jean-Philippe Pialasse 2.6.2-8.sme +- disable brp-python-bytecompile [SME: 12511] + +* Thu Mar 14 2024 Jean-Philippe Pialasse 2.6.2-7.sme - use python 3 to build and python 2, as needed for brp-python-bytecompile https://bugzilla.redhat.com/show_bug.cgi?id=1411588