From 77bb36a444b8d1239b46c04f8f3c6ae64821a7e5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 17 Mar 2020 09:50:32 +0100
Subject: update to 1.6.1 (2020-3-16) drop patch merged upstream

---
 ...-fix-multiple-definition-of-crc32c-GCC-10.patch | 39 ----------------------
 memcached.spec                                     |  8 +++--
 2 files changed, 5 insertions(+), 42 deletions(-)
 delete mode 100644 0001-fix-multiple-definition-of-crc32c-GCC-10.patch

diff --git a/0001-fix-multiple-definition-of-crc32c-GCC-10.patch b/0001-fix-multiple-definition-of-crc32c-GCC-10.patch
deleted file mode 100644
index 10d0fc7..0000000
--- a/0001-fix-multiple-definition-of-crc32c-GCC-10.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8e6b12f96886412d47894f56193b3b92bd4a850e Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 9 Mar 2020 13:04:06 +0100
-Subject: [PATCH] fix multiple definition of 'crc32c' (GCC 10)
-
----
- crc32c.c | 2 ++
- crc32c.h | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/crc32c.c b/crc32c.c
-index a4296a7..a3c526e 100644
---- a/crc32c.c
-+++ b/crc32c.c
-@@ -46,6 +46,8 @@
- #endif
- #include "crc32c.h"
- 
-+crc_func crc32c;
-+
- /* CRC-32C (iSCSI) polynomial in reversed bit order. */
- #define POLY 0x82f63b78
- 
-diff --git a/crc32c.h b/crc32c.h
-index 8b030de..c09cb42 100644
---- a/crc32c.h
-+++ b/crc32c.h
-@@ -2,7 +2,7 @@
- #define    CRC32C_H
- 
- typedef uint32_t (*crc_func)(uint32_t crc, const void *buf, size_t len);
--crc_func crc32c;
-+extern crc_func crc32c;
- 
- void crc32c_init(void);
- 
--- 
-2.24.1
-
diff --git a/memcached.spec b/memcached.spec
index 3dd37ab..cae3374 100644
--- a/memcached.spec
+++ b/memcached.spec
@@ -39,7 +39,7 @@
 %global with_tests   0%{?_with_tests:1}
 
 Name:           memcached
-Version:        1.6.0
+Version:        1.6.1
 Release:        1%{?dist}
 Epoch:          0
 Summary:        High Performance, Distributed Memory Object Cache
@@ -57,7 +57,6 @@ Source4:        memcached.sysv
 Source3:        memcached.service
 
 Patch1:         memcached-unit.patch
-Patch2:         0001-fix-multiple-definition-of-crc32c-GCC-10.patch
 
 BuildRequires:  gcc
 BuildRequires:  pkgconfig(libevent) >= 2
@@ -133,7 +132,6 @@ access to the memcached binary include files.
 # and SELinux policy sources into memcached-selinux-X.X
 %setup -q -b 2
 %patch1 -p1 -b .unit
-%patch2 -p1 -b .gcc10
 
 
 %build
@@ -347,6 +345,10 @@ fi
 
 
 %changelog
+* Tue Mar 17 2020 Remi Collet <remi@remirepo.net> - 1.6.1-1
+- update to 1.6.1 (2020-3-16)
+- drop patch merged upstream
+
 * Mon Mar  9 2020 Remi Collet <remi@remirepo.net> - 1.6.0-1
 - update to 1.6.0 (2020-3-8)
 - add patch for GCC 10 from
-- 
cgit