Accepting request 578435 from filesystems:ceph:mimic

bsc#1081836

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

ceph-13.0.1-1987-g4a523803f8.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:70a2c7a73f5dfb0e5db71084ad6e289e653fa9161ce3bb3e40e28b00c259a8e4
-size 65991760

ceph-13.0.1-2078-g85df538001.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e22ccefee291cc7d25092e43d481eee996eb7ff68333bd13293841bc4e91203
+size 65966519

ceph-test.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Feb 20 16:52:18 UTC 2018 - ncutler@suse.com
+
+- Update to version 13.0.1-2078-g85df538001:
+  + spec file:
+    * revert "enable --without-python2 bcond for all distros" (as of Code 15,
+      Python 2 bindings will not be built by default: projects wishing to build
+      them will need to provide --with-python2 explicitly) (bsc#1081836)
+
 -------------------------------------------------------------------
 Fri Feb 16 14:18:59 UTC 2018 - ncutler@suse.com
 

ceph-test.spec

@@ -45,7 +45,11 @@
 %endif
 %endif
 %endif
+%if 0%{?suse_version} >= 1500
+%bcond_with python2
+%else
 %bcond_without python2
+%endif
 %if 0%{without python2}
 %global _defined_if_python2_absent 1
 %endif
@@ -72,7 +76,7 @@
 # main package definition
 #################################################################################
 Name: ceph-test
-Version: 13.0.1.1987+g4a523803f8
+Version: 13.0.1.2078+g85df538001
 Release: 0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch: 2
@@ -88,7 +92,7 @@ License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and
 Group: System/Filesystems
 %endif
 URL: http://ceph.com/
-Source0: %{?_remote_tarball_prefix}ceph-13.0.1-1987-g4a523803f8.tar.bz2
+Source0: %{?_remote_tarball_prefix}ceph-13.0.1-2078-g85df538001.tar.bz2
 %if 0%{?suse_version}
 Source96: checkin.sh
 Source97: README-checkin.txt
@@ -393,7 +397,7 @@ This package contains Ceph benchmarks and test tools.
 %endif
 %endif
 %prep
-%autosetup -p1 -n ceph-13.0.1-1987-g4a523803f8
+%autosetup -p1 -n ceph-13.0.1-2078-g85df538001
 
 %build
 
@@ -455,7 +459,6 @@ cmake .. \
     -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
     -DWITH_EMBEDDED=OFF \
     -DWITH_MANPAGE=ON \
-    -DWITH_SYSTEMD=ON \
     -DWITH_PYTHON3=ON \
 %if %{with python2}
     -DWITH_PYTHON2=ON \
@@ -463,6 +466,7 @@ cmake .. \
     -DWITH_PYTHON2=OFF \
     -DMGR_PYTHON_VERSION=3 \
 %endif
+    -DWITH_SYSTEMD=ON \
 %if 0%{?rhel} && ! 0%{?centos}
     -DWITH_SUBMAN=ON \
 %endif

ceph.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Feb 20 16:52:18 UTC 2018 - ncutler@suse.com
+
+- Update to version 13.0.1-2078-g85df538001:
+  + spec file:
+    * revert "enable --without-python2 bcond for all distros" (as of Code 15,
+      Python 2 bindings will not be built by default: projects wishing to build
+      them will need to provide --with-python2 explicitly) (bsc#1081836)
+
 -------------------------------------------------------------------
 Fri Feb 16 14:18:59 UTC 2018 - ncutler@suse.com
 

ceph.spec

@@ -45,7 +45,11 @@
 %endif
 %endif
 %endif
+%if 0%{?suse_version} >= 1500
+%bcond_with python2
+%else
 %bcond_without python2
+%endif
 %if 0%{without python2}
 %global _defined_if_python2_absent 1
 %endif
@@ -72,7 +76,7 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	13.0.1.1987+g4a523803f8
+Version:	13.0.1.2078+g85df538001
 Release:	0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
@@ -88,7 +92,7 @@ License:	LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and
 Group:		System/Filesystems
 %endif
 URL:		http://ceph.com/
-Source0:	%{?_remote_tarball_prefix}ceph-13.0.1-1987-g4a523803f8.tar.bz2
+Source0:	%{?_remote_tarball_prefix}ceph-13.0.1-2078-g85df538001.tar.bz2
 %if 0%{?suse_version}
 # _insert_obs_source_lines_here
 %if 0%{?is_opensuse}
@@ -825,7 +829,7 @@ python-rbd, python-rgw or python-cephfs instead.
 # common
 #################################################################################
 %prep
-%autosetup -p1 -n ceph-13.0.1-1987-g4a523803f8
+%autosetup -p1 -n ceph-13.0.1-2078-g85df538001
 
 %build
 
@@ -887,7 +891,6 @@ cmake .. \
     -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
     -DWITH_EMBEDDED=OFF \
     -DWITH_MANPAGE=ON \
-    -DWITH_SYSTEMD=ON \
     -DWITH_PYTHON3=ON \
 %if %{with python2}
     -DWITH_PYTHON2=ON \
@@ -895,6 +898,7 @@ cmake .. \
     -DWITH_PYTHON2=OFF \
     -DMGR_PYTHON_VERSION=3 \
 %endif
+    -DWITH_SYSTEMD=ON \
 %if 0%{?rhel} && ! 0%{?centos}
     -DWITH_SUBMAN=ON \
 %endif