Accepting request 929713 from filesystems:ceph:pacific

bsc#1191751

OBS-URL: https://build.opensuse.org/request/show/929713
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=310

ceph-16.2.6-45-g8fda9838398.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5dbf8cecb9148e4ec73109817b3aa252afbb5030afaa46b041117e3691b6cb0e
-size 127383916

ceph-16.2.6-462-g5fefbbf8888.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:283fae760cb1624391b2cf4d7fb6abc4e90082eff048720b0b3778e097cc87c8
+size 127783100

ceph-test.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Nov  5 16:39:28 UTC 2021 - Nathan Cutler <ncutler@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
+
 -------------------------------------------------------------------
 Mon Sep 20 13:15:38 UTC 2021 - Stefen Allen <sallen@suse.com>
 

ceph-test.spec

@@ -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 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
 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 @@ This package contains Ceph benchmarks and test tools.
 %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.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Nov  5 16:39:28 UTC 2021 - Nathan Cutler <ncutler@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
+
 -------------------------------------------------------------------
 Mon Sep 20 13:15:38 UTC 2021 - Stefen Allen <sallen@suse.com>
 

ceph.spec

@@ -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 @@ License:	LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
 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 @@ This package provides Ceph default alerts for Prometheus.
 # 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 @@ if diff ${FILE_CONTEXT} ${FILE_CONTEXT}.pre > /dev/null 2>&1; then
    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
-    /usr/bin/systemctl stop ceph.target > /dev/null 2>&1
+    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 @@ rm -f ${FILE_CONTEXT}.pre
 
 # Start the daemons iff they were running before
 if test $STATUS -eq 0; then
-    /usr/bin/systemctl start ceph.target > /dev/null 2>&1 || :
+    if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
+        /usr/bin/systemctl start ceph.target > /dev/null 2>&1 || :
+    fi
 fi
 exit 0
 
@@ -2433,13 +2443,21 @@ if [ $1 -eq 0 ]; then
         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
-        /usr/bin/systemctl stop ceph.target > /dev/null 2>&1
+        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
@@ -2449,7 +2467,9 @@ if [ $1 -eq 0 ]; then
 
     # Start the daemons if they were running before
     if test $STATUS -eq 0; then
-	/usr/bin/systemctl start ceph.target > /dev/null 2>&1 || :
+        if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
+	    /usr/bin/systemctl start ceph.target > /dev/null 2>&1 || :
+        fi
     fi
 fi
 exit 0