refresh from upstream with all patches merged

4 files changed, 5 insertions, 77 deletions

diff --git a/101.patch b/101.patch
deleted file mode 100644
index f2f9677..0000000
--- a/101.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 90a4d45d23d63039ca06a59553bc64bd9911be82 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 23 Dec 2020 11:32:03 +0100
-Subject: [PATCH] fix libmemcached so version
-
----
- CMakeVersions.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeVersions.txt b/CMakeVersions.txt
-index 545e37dd..90942fd6 100644
---- a/CMakeVersions.txt
-+++ b/CMakeVersions.txt
-@@ -35,7 +35,7 @@ set(LIBMEMCACHED_SO_VERSION_CUR 11)
- set(LIBMEMCACHED_SO_VERSION_REV 0)
- set(LIBMEMCACHED_SO_VERSION_AGE 0)
- 
--set(LIBMEMCACHED_SO_SOVERSION ${LIBMEMCACHED_SO_VERSION_CUR}.${LIBMEMCACHED_SO_VERSION_REV})
-+set(LIBMEMCACHED_SO_SOVERSION ${LIBMEMCACHED_SO_VERSION_CUR})
- set(LIBMEMCACHED_SO_VERSION ${LIBMEMCACHED_SO_VERSION_CUR}.${LIBMEMCACHED_SO_VERSION_REV}.${LIBMEMCACHED_SO_VERSION_AGE})
- 
- #
diff --git a/102.patch b/102.patch
deleted file mode 100644
index 6044365..0000000
--- a/102.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From a5275a0698ae71674ba53706716c20cd2c886cea Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 23 Dec 2020 15:15:41 +0100
-Subject: [PATCH] fix doc build with old sphinx
-
----
- docs/conf.py.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/conf.py.in b/docs/conf.py.in
-index c582244f..4dd33573 100644
---- a/docs/conf.py.in
-+++ b/docs/conf.py.in
-@@ -13,7 +13,7 @@ import sys, os
- #needs_sphinx = '1.0'
- extensions = [@SPHINX_EXTENSIONS@]
- templates_path = ['_templates']
--source_suffix = ['.rst']
-+source_suffix = '.rst'
- master_doc = 'index'
- pygments_style = 'sphinx'
- 
diff --git a/104.patch b/104.patch
deleted file mode 100644
index 5b2071a..0000000
--- a/104.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 4ef24d8849ffcce9fdc78ef9907aa744a69687dc Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 23 Dec 2020 16:32:00 +0100
-Subject: [PATCH] fix for 32-bit
-
----
- test/lib/MemcachedCluster.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/lib/MemcachedCluster.cpp b/test/lib/MemcachedCluster.cpp
-index a443360b..4b1aa2c5 100644
---- a/test/lib/MemcachedCluster.cpp
-+++ b/test/lib/MemcachedCluster.cpp
-@@ -143,6 +143,6 @@ void MemcachedCluster::enableReplication() {
- 
- void MemcachedCluster::killOneServer() const {
-   const auto &servers = cluster.getServers();
--  const auto &victim = servers[random_num(0UL, servers.size() - 1)];
-+  const auto &victim = servers[random_num((size_t)0, servers.size() - 1)];
-   ::kill(victim.getPid(), SIGKILL);
- }
diff --git a/libmemcached-last.spec b/libmemcached-last.spec
index 7480277..c6f8caa 100644
--- a/libmemcached-last.spec
+++ b/libmemcached-last.spec
@@ -25,7 +25,7 @@ Name:      %{libname}-opt
 Name:      %{libname}
 %endif
 
-%global gh_commit            2f275201aac9994f7694acb67f5dee62adcb0424
+%global gh_commit            fcb03482e2d61dfe66ebac4d198bba1b41dd954b
 %global gh_short             %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner             m6w6
 %global gh_project           libmemcached
@@ -35,15 +35,11 @@ Name:      %{libname}
 
 Summary:   Client library and command line tools for memcached server
 Version:   %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   BSD
 URL:       https://github.com/%{gh_owner}/%{gh_project}
 Source0:   https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
 
-Patch0:    https://patch-diff.githubusercontent.com/raw/m6w6/libmemcached/pull/101.patch
-Patch1:    https://patch-diff.githubusercontent.com/raw/m6w6/libmemcached/pull/102.patch
-Patch2:    https://patch-diff.githubusercontent.com/raw/m6w6/libmemcached/pull/104.patch
-
 %if 0%{?rhel} == 7
 BuildRequires: cmake3 >= 3.9
 %global dtsenable source /opt/rh/devtoolset-7/enable
@@ -123,9 +119,6 @@ This package is designed to be installed beside %{libname}.
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1 -b .pr101
-%patch1 -p1 -b .pr102
-%patch2 -p1 -b .pr104
 
 # drop test hanging in mock
 if [ "$(id -un)" != "remi" ]; then
@@ -168,9 +161,6 @@ make %{?_smp_mflags}
 make install DESTDIR=%{buildroot}
 %endif
 
-# See https://github.com/m6w6/libmemcached/issues/97
-mkdir -p %{buildroot}%{_libdir}/cmake
-mv %{buildroot}%{_datadir}/libmemcached/cmake %{buildroot}%{_libdir}/cmake/libmemcached
 mv %{buildroot}%{_datadir}/libmemcached/example.cnf support
 
 rm -r %{buildroot}%{_datadir}/doc/libmemcached/
@@ -249,6 +239,9 @@ make test
 
 
 %changelog
+* Sat Dec 26 2020 Remi Collet <remi@remirepo.net> - 1.1.0~beta1-3
+- refresh from upstream with all patches merged
+
 * Wed Dec 23 2020 Remi Collet <remi@remirepo.net> - 1.1.0~beta1-2
 - add patches from upstream and from
   https://github.com/m6w6/libmemcached/pull/101 fix so version