New version (1:10.2.5-1)

- hack: do not check for libxfs, assume it is present

0002-hack-do-not-test-for-libxfs-assume-it-is-present.patch

@@ -0,0 +1,33 @@
+From 69e888fa5c103588ee9f23ac4cec4bfc2285eb08 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Fri, 13 Jan 2017 01:15:42 +0100
+Subject: [PATCH] hack: do not test for libxfs, assume it is present
+
+---
+ configure.ac | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 32e273f..050e754 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -882,7 +882,7 @@ AC_ARG_WITH([libxfs],
+   [AS_HELP_STRING([--without-libxfs], [disable libxfs use by FileStore])],
+   [],
+   [with_libxfs=yes])
+-AS_IF([test "x$with_libxfs" != "xno"], [
++AS_IF([test "x$with_libxfs" = "hack..."], [
+   # xfs/xfs.h presence and XFS_XFLAG_EXTSIZE define
+   AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
+     [xfs/xfs.h not found (--without-libxfs to disable)]))
+@@ -900,6 +900,7 @@ AS_IF([test "x$with_libxfs" != "xno"], [
+     AC_MSG_ERROR([XFS_XFLAG_EXTSIZE not found (--without-libxfs to disable)])
+   ])
+ ])
++AC_DEFINE([HAVE_LIBXFS], [1], [Define to 1 if you have libxfs])
+ AM_CONDITIONAL(WITH_LIBXFS, [test "x$with_libxfs" != "xno"])
+ 
+ # use libzfs
+-- 
+2.7.4
+

ceph.spec

@@ -56,7 +56,7 @@
 # common
 #################################################################################
 Name:		ceph
-Version:	10.2.4
+Version:	10.2.5
 Release:	1%{?dist}
 Epoch:		1
 Summary:	User space components of the Ceph file system
@@ -67,6 +67,7 @@ Group:         System/Filesystems
 URL:		http://ceph.com/
 Source0:	http://ceph.com/download/%{name}-%{version}.tar.gz
 Patch1: 0001-Disable-erasure_codelib-neon-build.patch
+Patch2: 0002-hack-do-not-test-for-libxfs-assume-it-is-present.patch
 %if 0%{?suse_version}
 %if 0%{?is_opensuse}
 ExclusiveArch:  x86_64 aarch64 ppc64 ppc64le
@@ -383,7 +384,7 @@ License:	LGPL-2.0
 Requires:	librados2 = %{epoch}:%{version}-%{release}
 Obsoletes:	ceph-devel < %{epoch}:%{version}-%{release}
 Provides:	librados2-devel = %{epoch}:%{version}-%{release}
-Obsoletes:	librados2-devel = %{epoch}:%{version}-%{release}
+Obsoletes:	librados2-devel < %{epoch}:%{version}-%{release}
 %description -n librados-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS object store.
@@ -403,7 +404,7 @@ Group:		Development/Libraries
 License:	LGPL-2.0
 Requires:	librados2 = %{epoch}:%{version}-%{release}
 Provides:	librgw2-devel = %{epoch}:%{version}-%{release}
-Obsoletes:	librgw2-devel = %{epoch}:%{version}-%{release}
+Obsoletes:	librgw2-devel < %{epoch}:%{version}-%{release}
 %description -n librgw-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS gateway client library.
@@ -436,7 +437,7 @@ Requires:	libradosstriper1 = %{epoch}:%{version}-%{release}
 Requires:	librados-devel = %{epoch}:%{version}-%{release}
 Obsoletes:	ceph-devel < %{epoch}:%{version}-%{release}
 Provides:	libradosstriper1-devel = %{epoch}:%{version}-%{release}
-Obsoletes:	libradosstriper1-devel = %{epoch}:%{version}-%{release}
+Obsoletes:	libradosstriper1-devel < %{epoch}:%{version}-%{release}
 %description -n libradosstriper-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS striping interface.
@@ -463,7 +464,7 @@ Requires:	librbd1 = %{epoch}:%{version}-%{release}
 Requires:	librados-devel = %{epoch}:%{version}-%{release}
 Obsoletes:	ceph-devel < %{epoch}:%{version}-%{release}
 Provides:	librbd1-devel = %{epoch}:%{version}-%{release}
-Obsoletes:	librbd1-devel = %{epoch}:%{version}-%{release}
+Obsoletes:	librbd1-devel < %{epoch}:%{version}-%{release}
 %description -n librbd-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS block device.
@@ -501,7 +502,7 @@ Requires:	libcephfs1 = %{epoch}:%{version}-%{release}
 Requires:	librados-devel = %{epoch}:%{version}-%{release}
 Obsoletes:	ceph-devel < %{epoch}:%{version}-%{release}
 Provides:	libcephfs1-devel = %{epoch}:%{version}-%{release}
-Obsoletes:	libcephfs1-devel = %{epoch}:%{version}-%{release}
+Obsoletes:	libcephfs1-devel < %{epoch}:%{version}-%{release}
 %description -n libcephfs-devel
 This package contains libraries and headers needed to develop programs
 that use Cephs distributed file system.
@@ -546,7 +547,7 @@ Requires:	java
 Requires:	libcephfs_jni1 = %{epoch}:%{version}-%{release}
 Obsoletes:	ceph-devel < %{epoch}:%{version}-%{release}
 Provides:	libcephfs_jni1-devel = %{epoch}:%{version}-%{release}
-Obsoletes:	libcephfs_jni1-devel = %{epoch}:%{version}-%{release}
+Obsoletes:	libcephfs_jni1-devel < %{epoch}:%{version}-%{release}
 %description -n libcephfs_jni-devel
 This package contains the development files for CephFS Java Native Interface
 library.
@@ -1551,6 +1552,16 @@ exit 0
 
 
 %changelog
+* Fri Jan 13 2017 Boris Ranto <branto@redhat.com> - 1:10.2.5-1
+- New release (1:10.2.5-1)
+- hack: do not test for libxfs, assume it is present
+
+* Wed Dec 14 2016 Boris Ranto <branto@redhat.com> - 1:10.2.4-2
+- New version (1:10.2.4-2)
+- This syncs up with the upstream 10.2.5
+- Doing it this way because of broken lookaside cache
+- Fix the -devel obsoletes
+
 * Thu Dec 08 2016 Boris Ranto <branto@redhat.com> - 1:10.2.4-1
 - New version (1:10.2.4-1)
 - Disable erasure_codelib neon build

sources

@@ -1 +1 @@
-ae84a14d93d0b7cc4fa59bac0c79746f  ceph-10.2.4.tar.gz
+SHA512 (ceph-10.2.5.tar.gz) = 4889aff38c8af781c2e3dce8f4ee51864db0a27c6294774345d2c1b047588ec31354ad41f799e2f0d0a966dc372d76c9bdbfb93f30a0718ea9d7c2b7a645d0f8