From d181f06fce89b1d56e545bfbfb8b1526cf250d6d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 28 Jul 2021 09:58:15 +0200 Subject: [PATCH] add LIBMEMCACHED_AWESOME macro from https://github.com/awesomized/libmemcached/pull/115 --- libmemcached-awesome-macro.patch | 21 +++++++++++++++++++++ libmemcached-awesome.spec | 8 +++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 libmemcached-awesome-macro.patch diff --git a/libmemcached-awesome-macro.patch b/libmemcached-awesome-macro.patch new file mode 100644 index 0000000..3b599b9 --- /dev/null +++ b/libmemcached-awesome-macro.patch @@ -0,0 +1,21 @@ +From 6e732f43b86a64b49fbb02d2b5da1a1a1152ddb9 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Tue, 13 Jul 2021 18:19:21 +0200 +Subject: [PATCH] define LIBMEMCACHED_AWESOME + +--- + include/libmemcached-1.0/configure.h.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/libmemcached-1.0/configure.h.in b/include/libmemcached-1.0/configure.h.in +index 168bbcb7..bcb1109f 100644 +--- a/include/libmemcached-1.0/configure.h.in ++++ b/include/libmemcached-1.0/configure.h.in +@@ -26,6 +26,7 @@ + #cmakedefine HAVE_PID_T 1 + #cmakedefine HAVE_SSIZE_T 1 + ++#define LIBMEMCACHED_AWESOME 1 + #define LIBMEMCACHED_VERSION_STRING "@LIBMEMCACHED_VERSION@" + #define LIBMEMCACHED_VERSION_HEX @LIBMEMCACHED_VERSION_HEX@ + diff --git a/libmemcached-awesome.spec b/libmemcached-awesome.spec index 02e71a0..17b3dcd 100644 --- a/libmemcached-awesome.spec +++ b/libmemcached-awesome.spec @@ -24,7 +24,7 @@ Name: %{libname}-awesome Summary: Client library and command line tools for memcached server Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 5%{?dist} +Release: 6%{?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 @@ -32,6 +32,7 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{g Patch0: %{name}-catch.patch Patch1: %{name}-aes.patch Patch2: %{name}-config.patch +Patch3: %{projname}-macro.patch BuildRequires: cmake >= 3.9 BuildRequires: gcc @@ -110,6 +111,7 @@ memtouch Touches a key %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # drop test hanging in mock # and requiring some memcached build options @@ -185,6 +187,10 @@ rm -r %{buildroot}%{_datadir}/doc/%{name}/ %changelog +* Tue Jul 27 2021 Remi Collet - 1.1.0-6 +- add LIBMEMCACHED_AWESOME macro from + https://github.com/awesomized/libmemcached/pull/115 + * Mon Jul 26 2021 Remi Collet - 1.1.0-5 - fix missing HAVE_SSIZE_T macro using patch from https://github.com/awesomized/libmemcached/pull/117