diff --git a/libmemcached-build.patch b/libmemcached-build.patch new file mode 100644 index 0000000..df58c9f --- /dev/null +++ b/libmemcached-build.patch @@ -0,0 +1,21 @@ +diff -up ./clients/memflush.cc.old ./clients/memflush.cc +--- ./clients/memflush.cc.old 2017-02-12 10:12:59.615209225 +0100 ++++ ./clients/memflush.cc 2017-02-12 10:13:39.998382783 +0100 +@@ -39,7 +39,7 @@ int main(int argc, char *argv[]) + { + options_parse(argc, argv); + +- if (opt_servers == false) ++ if (!opt_servers) + { + char *temp; + +@@ -48,7 +48,7 @@ int main(int argc, char *argv[]) + opt_servers= strdup(temp); + } + +- if (opt_servers == false) ++ if (!opt_servers) + { + std::cerr << "No Servers provided" << std::endl; + exit(EXIT_FAILURE); diff --git a/libmemcached.spec b/libmemcached.spec index 78ba3b8..923b490 100644 --- a/libmemcached.spec +++ b/libmemcached.spec @@ -1,13 +1,13 @@ # spec file for libmemcached # -# Copyright (c) 2009-2014 Remi Collet +# Copyright (c) 2009-2017 Remi Collet # License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/3.0/ +# http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # # Lot of tests are broken making test suite unusable -%global with_tests %{?_witht_tests:1}%{!?_with_tests:0} +%global with_tests 0%{?_witht_tests:1} %global with_sasl 1 %global libname libmemcached @@ -42,6 +42,9 @@ Provides: bundled(bobjenkins-hash) Requires: %{name}-libs%{?_isa} = %{version}-%{release} Patch0: libmemcached-fix-linking-with-libpthread.patch +# Fix: ISO C++ forbids comparison between pointer and integer [-fpermissive] +Patch1: %{libname}-build.patch + %description libmemcached is a C/C++ client library and tools for the memcached server @@ -91,7 +94,8 @@ This package contains the %{libname} libraries version %{version}. %prep %setup -q -n %{libname}-%{version} -%patch0 -p1 +%patch0 -p1 -b .link +%patch1 -p1 -b .build mkdir examples cp -p tests/*.{cc,h} examples/ @@ -156,7 +160,8 @@ make test %{_mandir}/man1/mem* %files libs -%doc AUTHORS COPYING README THANKS TODO ChangeLog +%license COPYING +%doc AUTHORS README THANKS TODO ChangeLog %{_libdir}/libhashkit.so.2* %{_libdir}/libmemcached.so.11* %{_libdir}/libmemcachedprotocol.so.0* @@ -183,6 +188,9 @@ make test %changelog +* Sat Feb 12 2017 Remi Collet - 1.0.18-8 +- add build patch to fix FTBFS + * Fri Feb 10 2017 Fedora Release Engineering - 1.0.18-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild