Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ceph for openSUSE:Factory checked in
at 2021-11-09 23:53:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ceph (Old)
and /work/SRC/openSUSE:Factory/.ceph.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ceph"
Tue Nov 9 23:53:46 2021 rev:74 rq:929714 version:16.2.6.462+g5fefbbf8888
Changes:
--------
--- /work/SRC/openSUSE:Factory/ceph/ceph-test.changes 2021-09-26
21:48:51.498790531 +0200
+++ /work/SRC/openSUSE:Factory/.ceph.new.1890/ceph-test.changes 2021-11-09
23:53:54.587931184 +0100
@@ -1,0 +2,8 @@
+Fri Nov 5 16:39:28 UTC 2021 - Nathan Cutler <ncut...@suse.com>
+
+- Update to 16.2.6-462-g5fefbbf8888:
+ + rebased on top of upstream commit SHA1
dd7139c66c1d36da50475ec97d8d6b54b07d1dea
+ * (bsc#1191751) rgw/tracing: unify SO version numbers within librgw2
package
+ * spec: make selinux scriptlets respect CEPH_AUTO_RESTART_ON_UPGRADE
+
+-------------------------------------------------------------------
ceph.changes: same change
Old:
----
ceph-16.2.6-45-g8fda9838398.tar.bz2
New:
----
ceph-16.2.6-462-g5fefbbf8888.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ceph-test.spec ++++++
--- /var/tmp/diff_new_pack.laCpHS/_old 2021-11-09 23:53:55.603931703 +0100
+++ /var/tmp/diff_new_pack.laCpHS/_new 2021-11-09 23:53:55.603931703 +0100
@@ -127,7 +127,7 @@
# main package definition
#################################################################################
Name: ceph-test
-Version: 16.2.6.45+g8fda9838398
+Version: 16.2.6.462+g5fefbbf8888
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@@ -143,7 +143,7 @@
Group: System/Filesystems
%endif
URL: http://ceph.com/
-Source0: %{?_remote_tarball_prefix}ceph-16.2.6-45-g8fda9838398.tar.bz2
+Source0: %{?_remote_tarball_prefix}ceph-16.2.6-462-g5fefbbf8888.tar.bz2
%if 0%{?suse_version}
Source94: ceph-rpmlintrc
Source95: checkin.sh
@@ -594,7 +594,7 @@
%if 0%{?suse_version}
%endif
%prep
-%autosetup -p1 -n ceph-16.2.6-45-g8fda9838398
+%autosetup -p1 -n ceph-16.2.6-462-g5fefbbf8888
%build
# LTO can be enabled as soon as the following GCC bug is fixed:
++++++ ceph.spec ++++++
--- /var/tmp/diff_new_pack.laCpHS/_old 2021-11-09 23:53:55.619931711 +0100
+++ /var/tmp/diff_new_pack.laCpHS/_new 2021-11-09 23:53:55.619931711 +0100
@@ -127,7 +127,7 @@
# main package definition
#################################################################################
Name: ceph
-Version: 16.2.6.45+g8fda9838398
+Version: 16.2.6.462+g5fefbbf8888
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@@ -143,7 +143,7 @@
Group: System/Filesystems
%endif
URL: http://ceph.com/
-Source0: %{?_remote_tarball_prefix}ceph-16.2.6-45-g8fda9838398.tar.bz2
+Source0: %{?_remote_tarball_prefix}ceph-16.2.6-462-g5fefbbf8888.tar.bz2
%if 0%{?suse_version}
# _insert_obs_source_lines_here
ExclusiveArch: x86_64 aarch64 ppc64le s390x
@@ -1211,7 +1211,7 @@
# common
#################################################################################
%prep
-%autosetup -p1 -n ceph-16.2.6-45-g8fda9838398
+%autosetup -p1 -n ceph-16.2.6-462-g5fefbbf8888
%build
# LTO can be enabled as soon as the following GCC bug is fixed:
@@ -2395,13 +2395,21 @@
exit 0
fi
+# Stop ceph.target while relabeling if CEPH_AUTO_RESTART_ON_UPGRADE=yes
+SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph
+if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then
+ source $SYSCONF_CEPH
+fi
+
# Check whether the daemons are running
/usr/bin/systemctl status ceph.target > /dev/null 2>&1
STATUS=$?
# Stop the daemons if they were running
if test $STATUS -eq 0; then
+ if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl stop ceph.target > /dev/null 2>&1
+ fi
fi
# Relabel the files fix for first package install
@@ -2413,7 +2421,9 @@
# Start the daemons iff they were running before
if test $STATUS -eq 0; then
+ if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl start ceph.target > /dev/null 2>&1 || :
+ fi
fi
exit 0
@@ -2433,14 +2443,22 @@
exit 0
fi
+ # Stop ceph.target while relabeling if CEPH_AUTO_RESTART_ON_UPGRADE=yes
+ SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph
+ if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then
+ source $SYSCONF_CEPH
+ fi
+
# Check whether the daemons are running
/usr/bin/systemctl status ceph.target > /dev/null 2>&1
STATUS=$?
# Stop the daemons if they were running
if test $STATUS -eq 0; then
+ if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl stop ceph.target > /dev/null 2>&1
fi
+ fi
/usr/sbin/fixfiles -C ${FILE_CONTEXT}.pre restore 2> /dev/null
rm -f ${FILE_CONTEXT}.pre
@@ -2449,8 +2467,10 @@
# Start the daemons if they were running before
if test $STATUS -eq 0; then
+ if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl start ceph.target > /dev/null 2>&1 || :
fi
+ fi
fi
exit 0
%endif
++++++ ceph-16.2.6-45-g8fda9838398.tar.bz2 ->
ceph-16.2.6-462-g5fefbbf8888.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/ceph/ceph-16.2.6-45-g8fda9838398.tar.bz2
/work/SRC/openSUSE:Factory/.ceph.new.1890/ceph-16.2.6-462-g5fefbbf8888.tar.bz2
differ: char 11, line 1
