diff --git a/libmemcached-awesome-config.patch b/libmemcached-awesome-config.patch new file mode 100644 index 0000000..6ec63ec --- /dev/null +++ b/libmemcached-awesome-config.patch @@ -0,0 +1,64 @@ +From 8b3a224e03457bfab11f0974114f28b2ba7a568f Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Mon, 26 Jul 2021 10:02:24 +0200 +Subject: [PATCH] Fix #116 add configure.h for libmemcachedprotocol + +--- + .../libmemcachedprotocol-0.0/CMakeLists.txt | 1 + + .../libmemcachedprotocol-0.0/configure.h.in | 19 +++++++++++++++++++ + include/libmemcachedprotocol-0.0/handler.h | 1 + + 3 files changed, 21 insertions(+) + create mode 100644 include/libmemcachedprotocol-0.0/configure.h.in + +diff --git a/include/libmemcachedprotocol-0.0/CMakeLists.txt b/include/libmemcachedprotocol-0.0/CMakeLists.txt +index 6d4fb220..71b4f260 100644 +--- a/include/libmemcachedprotocol-0.0/CMakeLists.txt ++++ b/include/libmemcachedprotocol-0.0/CMakeLists.txt +@@ -2,6 +2,7 @@ + install_public_headers( + libmemcachedprotocol-0.0 + ++ @configure.h + binary.h + callback.h + handler.h +diff --git a/include/libmemcachedprotocol-0.0/configure.h.in b/include/libmemcachedprotocol-0.0/configure.h.in +new file mode 100644 +index 00000000..f4d77c28 +--- /dev/null ++++ b/include/libmemcachedprotocol-0.0/configure.h.in +@@ -0,0 +1,19 @@ ++/* ++ +--------------------------------------------------------------------+ ++ | libmemcached-awesome - C/C++ Client Library for memcached | ++ +--------------------------------------------------------------------+ ++ | Redistribution and use in source and binary forms, with or without | ++ | modification, are permitted under the terms of the BSD license. | ++ | You should have received a copy of the license in a bundled file | ++ | named LICENSE; in case you did not receive a copy you can review | ++ | the terms online at: https://opensource.org/licenses/BSD-3-Clause | ++ +--------------------------------------------------------------------+ ++ | Copyright (c) 2006-2014 Brian Aker https://datadifferential.com/ | ++ | Copyright (c) 2020-2021 Michael Wallner https://awesome.co/ | ++ +--------------------------------------------------------------------+ ++*/ ++ ++#pragma once ++ ++#cmakedefine HAVE_SSIZE_T 1 ++ +diff --git a/include/libmemcachedprotocol-0.0/handler.h b/include/libmemcachedprotocol-0.0/handler.h +index 04e47acf..3b576d02 100644 +--- a/include/libmemcachedprotocol-0.0/handler.h ++++ b/include/libmemcachedprotocol-0.0/handler.h +@@ -15,6 +15,7 @@ + + #pragma once + ++#include "libmemcachedprotocol-0.0/configure.h" + #include + #ifndef HAVE_SSIZE_T + typedef long int ssize_t; +-- +2.31.1 + diff --git a/libmemcached-awesome.spec b/libmemcached-awesome.spec index 6bd7814..02e71a0 100644 --- a/libmemcached-awesome.spec +++ b/libmemcached-awesome.spec @@ -24,13 +24,14 @@ Name: %{libname}-awesome Summary: Client library and command line tools for memcached server Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 4%{?dist} +Release: 5%{?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: %{name}-catch.patch Patch1: %{name}-aes.patch +Patch2: %{name}-config.patch BuildRequires: cmake >= 3.9 BuildRequires: gcc @@ -108,6 +109,7 @@ memtouch Touches a key %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 %patch1 -p1 +%patch2 -p1 # drop test hanging in mock # and requiring some memcached build options @@ -183,6 +185,10 @@ rm -r %{buildroot}%{_datadir}/doc/%{name}/ %changelog +* 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 + * Thu Jul 22 2021 Fedora Release Engineering - 1.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild