Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ceph for openSUSE:Factory checked in
at 2025-04-16 20:37:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ceph (Old)
and /work/SRC/openSUSE:Factory/.ceph.new.30101 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ceph"
Wed Apr 16 20:37:13 2025 rev:99 rq:1269777 version:16.2.15.84+gb9c09b69575
Changes:
--------
--- /work/SRC/openSUSE:Factory/ceph/ceph.changes 2025-04-14
12:55:58.846198181 +0200
+++ /work/SRC/openSUSE:Factory/.ceph.new.30101/ceph.changes 2025-04-20
19:50:45.453850023 +0200
@@ -1,0 +2,6 @@
+Wed Apr 16 04:09:58 UTC 2025 - Tim Serong <tser...@suse.com>
+
+- Update to 16.2.15-84-gb9c09b69575:
+ + ceph.spec.in: Fix cephfs-{top,shell} shebangs with setuptools >= 76
+
+-------------------------------------------------------------------
Old:
----
ceph-16.2.15-83-g635361e68c0.tar.bz2
New:
----
ceph-16.2.15-84-gb9c09b69575.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ceph-test.spec ++++++
--- /var/tmp/diff_new_pack.CIMnEN/_old 2025-04-20 19:50:46.521894472 +0200
+++ /var/tmp/diff_new_pack.CIMnEN/_new 2025-04-20 19:50:46.525894639 +0200
@@ -138,7 +138,7 @@
# main package definition
#################################################################################
Name: ceph-test
-Version: 16.2.15.83+g635361e68c0
+Version: 16.2.15.84+gb9c09b69575
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@@ -154,7 +154,7 @@
Group: System/Filesystems
%endif
URL: http://ceph.com/
-Source0: %{?_remote_tarball_prefix}ceph-16.2.15-83-g635361e68c0.tar.bz2
+Source0: %{?_remote_tarball_prefix}ceph-16.2.15-84-gb9c09b69575.tar.bz2
%if 0%{?suse_version}
Source92: ceph-rpmlintrc
Source93: checkin.sh
@@ -599,7 +599,7 @@
%if 0%{?suse_version}
%endif
%prep
-%autosetup -p1 -n ceph-16.2.15-83-g635361e68c0
+%autosetup -p1 -n ceph-16.2.15-84-gb9c09b69575
%build
# Disable lto on systems that do not support symver attribute
@@ -763,6 +763,19 @@
rm -f %{buildroot}/%{_sysconfdir}/init.d/ceph
popd
+#
+# python's setuptools v76 introduces a simplified shebang
+# generation which results in cephfs-top and cephfs-shell just
+# saying "#!python", rather than "#!/usr/bin/python3.xx".
+# The former of course is invalid. The correct solution for
+# ceph is presumably to somehow switch to using `pip` instead
+# (see https://packaging.python.org/en/latest/discussions/setup-py-deprecated/)
+# but for the sake of expedience right now we're just fixing
+# the invalid shebang lines here with a bit of sed.
+#
+sed -i s:^#\!python$:#\!$(readlink -f %{_bindir}/python3):g
%{buildroot}%{_bindir}/cephfs-top
+sed -i s:^#\!python$:#\!$(readlink -f %{_bindir}/python3):g
%{buildroot}%{_bindir}/cephfs-shell
+
%if 0%{with seastar}
# package crimson-osd with the name of ceph-osd
install -m 0755 %{buildroot}%{_bindir}/crimson-osd
%{buildroot}%{_bindir}/ceph-osd
++++++ ceph.spec ++++++
--- /var/tmp/diff_new_pack.CIMnEN/_old 2025-04-20 19:50:46.577896803 +0200
+++ /var/tmp/diff_new_pack.CIMnEN/_new 2025-04-20 19:50:46.581896970 +0200
@@ -138,7 +138,7 @@
# main package definition
#################################################################################
Name: ceph
-Version: 16.2.15.83+g635361e68c0
+Version: 16.2.15.84+gb9c09b69575
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@@ -154,7 +154,7 @@
Group: System/Filesystems
%endif
URL: http://ceph.com/
-Source0: %{?_remote_tarball_prefix}ceph-16.2.15-83-g635361e68c0.tar.bz2
+Source0: %{?_remote_tarball_prefix}ceph-16.2.15-84-gb9c09b69575.tar.bz2
%if 0%{?suse_version}
# _insert_obs_source_lines_here
ExclusiveArch: x86_64 aarch64 ppc64le s390x riscv64
@@ -1215,7 +1215,7 @@
# common
#################################################################################
%prep
-%autosetup -p1 -n ceph-16.2.15-83-g635361e68c0
+%autosetup -p1 -n ceph-16.2.15-84-gb9c09b69575
%build
# Disable lto on systems that do not support symver attribute
@@ -1379,6 +1379,19 @@
rm -f %{buildroot}/%{_sysconfdir}/init.d/ceph
popd
+#
+# python's setuptools v76 introduces a simplified shebang
+# generation which results in cephfs-top and cephfs-shell just
+# saying "#!python", rather than "#!/usr/bin/python3.xx".
+# The former of course is invalid. The correct solution for
+# ceph is presumably to somehow switch to using `pip` instead
+# (see https://packaging.python.org/en/latest/discussions/setup-py-deprecated/)
+# but for the sake of expedience right now we're just fixing
+# the invalid shebang lines here with a bit of sed.
+#
+sed -i s:^#\!python$:#\!$(readlink -f %{_bindir}/python3):g
%{buildroot}%{_bindir}/cephfs-top
+sed -i s:^#\!python$:#\!$(readlink -f %{_bindir}/python3):g
%{buildroot}%{_bindir}/cephfs-shell
+
%if 0%{with seastar}
# package crimson-osd with the name of ceph-osd
install -m 0755 %{buildroot}%{_bindir}/crimson-osd
%{buildroot}%{_bindir}/ceph-osd
++++++ ceph-16.2.15-83-g635361e68c0.tar.bz2 ->
ceph-16.2.15-84-gb9c09b69575.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/ceph/ceph-16.2.15-83-g635361e68c0.tar.bz2
/work/SRC/openSUSE:Factory/.ceph.new.30101/ceph-16.2.15-84-gb9c09b69575.tar.bz2
differ: char 12, line 1
