diff --git a/0001-Disable-erasure_codelib-neon-build.patch b/0001-Disable-erasure_codelib-neon-build.patch index 6b76561..6c5c6d4 100644 --- a/0001-Disable-erasure_codelib-neon-build.patch +++ b/0001-Disable-erasure_codelib-neon-build.patch @@ -1,4 +1,4 @@ -From c850a2a598fd1df4c2925e09ff3ed583a6cdc59b Mon Sep 17 00:00:00 2001 +From b0c5f4beca45bcb562c969e1c6b18a192e229c91 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Wed, 11 Nov 2015 17:08:06 +0100 Subject: [PATCH] Disable erasure_codelib neon build @@ -42,6 +42,3 @@ index 6b658d5..93051f4 100644 libec_shec_sse3_la_SOURCES = ${shec_sources} libec_shec_sse3_la_CFLAGS = ${AM_CFLAGS} \ --- -2.7.4 - diff --git a/0002-common-instantiate-strict_si_cast-long-not-strict_si.patch b/0002-common-instantiate-strict_si_cast-long-not-strict_si.patch index a912fe4..39a0514 100644 --- a/0002-common-instantiate-strict_si_cast-long-not-strict_si.patch +++ b/0002-common-instantiate-strict_si_cast-long-not-strict_si.patch @@ -1,4 +1,4 @@ -From 870cc11b3ed170c1046ad719eeb4a1014371a4ad Mon Sep 17 00:00:00 2001 +From c7bf5767279cc5470408ed51dd47d462ea6c225c Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 26 Jun 2016 01:02:03 +0800 Subject: [PATCH] common: instantiate strict_si_cast not @@ -45,6 +45,3 @@ index f43d661..04e09b1 100644 template uint64_t strict_si_cast(const char *str, std::string *err); --- -2.7.4 - diff --git a/ceph.spec b/ceph.spec index 165868b..9ca2e89 100644 --- a/ceph.spec +++ b/ceph.spec @@ -55,7 +55,7 @@ ################################################################################# Name: ceph Version: 10.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: User space components of the Ceph file system License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT @@ -64,8 +64,10 @@ Group: System/Filesystems %endif URL: http://ceph.com/ Source0: http://ceph.com/download/%{name}-%{version}.tar.gz -Patch1: 0001-Disable-erasure_codelib-neon-build.patch -Patch2: 0002-common-instantiate-strict_si_cast-long-not-strict_si.patch + +Patch0001: 0001-Disable-erasure_codelib-neon-build.patch +Patch0002: 0002-common-instantiate-strict_si_cast-long-not-strict_si.patch + %if 0%{?suse_version} %if 0%{?is_opensuse} ExclusiveArch: x86_64 aarch64 ppc64 ppc64le @@ -625,9 +627,7 @@ python-cephfs instead. # common ################################################################################# %prep -%setup -q -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 %build %if 0%{with cephfs_java} @@ -1537,6 +1537,9 @@ exit 0 %changelog +* Wed Oct 26 2016 Ken Dreyer 1:10.2.3-3 +- update patches style for rdopkg + * Thu Sep 29 2016 Boris Ranto - 1:10.2.3-2 - New release (1:10.2.3-2) - common: instantiate strict_si_cast not