From 6d9510539c717e28e8174ca2545fab526bad4eda Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Thu, 3 Aug 2017 10:23:44 -0400
Subject: [PATCH] New release (1:12.1.2-1)

---
 ceph.spec | 40 +++++++++++++++++++---------------------
 sources   |  2 +-
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/ceph.spec b/ceph.spec
index 21b27f9..8c3fe10 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -26,7 +26,6 @@
 %bcond_without ceph_test_package
 %endif
 %bcond_with make_check
-%bcond_with xio
 %ifarch s390 s390x
 %bcond_with tcmalloc
 %else
@@ -70,8 +69,8 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	12.1.1
-Release:	8%{?dist}
+Version:	12.1.2
+Release:	1%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		1
 %endif
@@ -114,6 +113,18 @@ BuildRequires:	checkpolicy
 BuildRequires:	selinux-policy-devel
 BuildRequires:	/usr/share/selinux/devel/policyhelp
 %endif
+%if 0%{with make_check}
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: python-cherrypy
+BuildRequires: python-werkzeug
+%endif
+%if 0%{?suse_version}
+BuildRequires: python-CherryPy
+BuildRequires: python-Werkzeug
+%endif
+BuildRequires: python-pecan
+BuildRequires: socat
+%endif
 BuildRequires:	bc
 BuildRequires:	gperf
 BuildRequires:  cmake
@@ -139,11 +150,8 @@ BuildRequires:	pkgconfig
 BuildRequires:	python
 BuildRequires:	python-devel
 BuildRequires:	python-nose
-BuildRequires:	python-pecan
 BuildRequires:	python-requests
 BuildRequires:	python-virtualenv
-BuildRequires:	python-werkzeug
-BuildRequires:	socat
 BuildRequires:	snappy-devel
 BuildRequires:	udev
 BuildRequires:	util-linux
@@ -171,7 +179,6 @@ BuildRequires:	keyutils-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  lsb-release
 BuildRequires:  openldap2-devel
-BuildRequires:	python-CherryPy
 BuildRequires:	python-Cython
 BuildRequires:	python-PrettyTable
 BuildRequires:	python-Sphinx
@@ -188,7 +195,6 @@ BuildRequires:  openldap-devel
 BuildRequires:  openssl-devel
 BuildRequires:  redhat-lsb-core
 BuildRequires:	Cython
-BuildRequires:	python-cherrypy
 BuildRequires:	python-prettytable
 BuildRequires:	python-sphinx
 %endif
@@ -223,10 +229,6 @@ BuildRequires:	expat-devel
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires:  redhat-rpm-config
 %endif
-# Accelio IB/RDMA
-%if 0%{with xio}
-BuildRequires:  libxio-devel
-%endif
 
 %description
 Ceph is a massively scalable, open-source, distributed storage system that runs
@@ -263,9 +265,6 @@ Requires:      which
 %if 0%{?suse_version}
 Recommends:    ntp-daemon
 %endif
-%if 0%{with xio}
-Requires:      libxio
-%endif
 %description base
 Base is the package that includes all the files shared amongst ceph servers
 
@@ -292,9 +291,6 @@ Requires:	python-requests
 %if 0%{?suse_version}
 Requires(pre):	pwdutils
 %endif
-%if 0%{with xio}
-Requires:       libxio
-%endif
 %description -n ceph-common
 Common utilities to mount and interact with a ceph storage cluster.
 Comprised of files that are common to Ceph clients and servers.
@@ -694,6 +690,7 @@ Group:		System/Benchmark
 Requires:	ceph-common
 Requires:	xmlstarlet
 Requires:	jq
+Requires:	socat
 %description -n ceph-test
 This package contains Ceph benchmarks and test tools.
 %endif
@@ -837,6 +834,7 @@ cmake .. \
     -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \
     -DCMAKE_INSTALL_MANDIR=%{_mandir} \
     -DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \
+    -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
     -DWITH_EMBEDDED=OFF \
     -DWITH_MANPAGE=ON \
     -DWITH_PYTHON3=ON \
@@ -844,9 +842,6 @@ cmake .. \
 %if ( ( 0%{?rhel} && 0%{?rhel} <= 7) && ! 0%{?centos} )
     -DWITH_SUBMAN=ON \
 %endif
-%if 0%{with xio}
-    -DWITH_XIO=ON \
-%endif
 %if 0%{without ceph_test_package}
     -DWITH_TESTS=OFF \
 %endif
@@ -1772,6 +1767,9 @@ exit 0
 
 
 %changelog
+* Thu Aug 3 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.2-1
+- New release (1:12.1.2-1)
+
 * Tue Aug 1 2017 Boris Ranto <branto@redhat.com> - 1:12.1.1-8
 - Fix ppc64 build
 
diff --git a/sources b/sources
index e54b270..c25ba0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ceph-12.1.1.tar.gz) = 2355f24c7f2c94f53402f8c26c482af81fd28ee309d33b85ca7891631b3da012733e6f10c10194b9a7a59b047b2227099eb1e1ad27b4b115d0103d17e34a2988
+SHA512 (ceph-12.1.2.tar.gz) = 05a0a568ea1b6e9bdba24ae136aba0abda2efe5daffe2a8954c7721c75a0d7f2bfa36408fa2f4e34181b4d3d190ccbbef3e19a2de74beaa986aad972a557e847