Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package subunit for openSUSE:Factory checked
in at 2023-07-13 17:18:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/subunit (Old)
and /work/SRC/openSUSE:Factory/.subunit.new.8922 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "subunit"
Thu Jul 13 17:18:15 2023 rev:13 rq:1098493 version:1.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/subunit/subunit.changes 2023-03-28
17:48:40.562775314 +0200
+++ /work/SRC/openSUSE:Factory/.subunit.new.8922/subunit.changes
2023-07-13 17:18:16.829022374 +0200
@@ -1,0 +2,14 @@
+Thu Jul 13 08:59:30 UTC 2023 - Johannes Kastl <ka...@b1-systems.de>
+
+- remove hardcoded python executable names from Makefile and test
+ scripts
+- Use python_subpackage_only 1 everywhere, not only on Tumbleweed
+ and Leap 15.5
+
+-------------------------------------------------------------------
+Mon Jul 3 11:43:29 UTC 2023 - ecsos <ec...@opensuse.org>
+
+- Add %{?sle15_python_module_pythons}
+- Use python_subpackage_only 1 from Tumbleweed for Leap 15.5 also.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ subunit.spec ++++++
--- /var/tmp/diff_new_pack.Zac6gt/_old 2023-07-13 17:18:17.437025962 +0200
+++ /var/tmp/diff_new_pack.Zac6gt/_new 2023-07-13 17:18:17.441025985 +0200
@@ -17,14 +17,9 @@
%define skip_python2 1
-%if 0%{?suse_version} >= 1550
-# TW: generate subpackages for every python3 flavor
%define python_subpackage_only 1
-%else
-%define python_sitelib %{python3_sitelib}
-%define python_files() -n python3-%{**}
-%endif
%bcond_with python2
+%{?sle15_python_module_pythons}
Name: subunit
Version: 1.4.2
%global majver %(awk 'BEGIN { OFS="."; FS="[\\.\\+]+" } {print $1, $2, $3}'
<<< %{version})
@@ -252,11 +247,16 @@
touch -r perl/subunit-diff %{buildroot}%{_bindir}/subunit-diff
%check
+%if 0%{?suse_version} > 1500
%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib}
PYTHON=%{$python}
# https://bugs.launchpad.net/subunit/+bug/1323410
find . -name sample\*.py -exec chmod +x '{}' \;
+# replace hardcoded python3 with the python executable that is actually used
+find . -name sample\*.py -exec sed -i
"1{s/python3.*$/python%{$python_version}/;}" {} +
+sed -i '/testtools.run/ s#$(PYTHON)#/usr/bin/python%{$python_version}#'
Makefile
%make_build check
}
+%endif
%post -n libsubunit0 -p /sbin/ldconfig
%postun -n libsubunit0 -p /sbin/ldconfig
