From df6ba84fb3379a1d84d093010a1ac01826d737c4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Oct 30 2017 09:24:02 +0000 Subject: Fix FTBFS Signed-off-by: Igor Gnatenko --- diff --git a/0001-build-do-not-assume-that-INSTALL-is-cp.patch b/0001-build-do-not-assume-that-INSTALL-is-cp.patch new file mode 100644 index 0000000..a15941c --- /dev/null +++ b/0001-build-do-not-assume-that-INSTALL-is-cp.patch @@ -0,0 +1,39 @@ +From 725a96aaa247cae90f46753ca85dadbf22a64e5f Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Mon, 30 Oct 2017 10:19:47 +0100 +Subject: [PATCH] build: do not assume that INSTALL is cp +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +INSTALL is supposed to be `install` in most of the cases which +doesn't work with directories, but works perfectly with files. + +Don't do this assumption. + +Reported-by: Jiří Vymazal +References: https://bugzilla.redhat.com/show_bug.cgi?id=1506251 +Signed-off-by: Igor Gnatenko +--- + Makefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 781a41d..c6eb229 100644 +--- a/Makefile ++++ b/Makefile +@@ -181,8 +181,9 @@ $(PKGCONFNAME): hiredis.h + @echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@ + + install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) +- mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH) +- $(INSTALL) hiredis.h async.h read.h sds.h adapters $(INSTALL_INCLUDE_PATH) ++ mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_INCLUDE_PATH)/adapters $(INSTALL_LIBRARY_PATH) ++ $(INSTALL) hiredis.h async.h read.h sds.h $(INSTALL_INCLUDE_PATH) ++ $(INSTALL) adapters/*.h $(INSTALL_INCLUDE_PATH)/adapters + $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME) + cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME) + $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH) +-- +2.14.3 + diff --git a/hiredis.spec b/hiredis.spec index 782577c..17bed18 100644 --- a/hiredis.spec +++ b/hiredis.spec @@ -1,10 +1,13 @@ Name: hiredis Version: 0.13.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Minimalistic C client library for Redis License: BSD URL: https://github.com/redis/hiredis Source0: https://github.com/redis/hiredis/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# https://github.com/redis/hiredis/pull/554 +Patch0: 0001-build-do-not-assume-that-INSTALL-is-cp.patch +BuildRequires: gcc BuildRequires: redis %description @@ -19,7 +22,7 @@ This package contains libraries and header files for developing applications that use %{name}. %prep -%setup -q +%autosetup -p1 %build %make_build PREFIX="%{_prefix}" LIBRARY_PATH="%{_lib}" \ @@ -53,6 +56,9 @@ make check || true %{_libdir}/pkgconfig/hiredis.pc %changelog +* Mon Oct 30 2017 Igor Gnatenko - 0.13.3-6 +- Fix FTBFS + * Wed Aug 02 2017 Fedora Release Engineering - 0.13.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild