From fc921765f9f394d27681b9020c69b0f4ad5b1332 Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Oct 20 2016 06:21:45 +0000 Subject: Fix whitespace in native patch for fuzz=0 opt in f25+ --- diff --git a/accumulo.spec b/accumulo.spec index fffcf0a..26ce040 100644 --- a/accumulo.spec +++ b/accumulo.spec @@ -9,7 +9,7 @@ Name: %{proj} Version: 1.6.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A software platform for processing vast amounts of data License: ASL 2.0 Group: Development/Libraries @@ -523,6 +523,9 @@ getent passwd %{name} >/dev/null || /usr/sbin/useradd --comment "%{longproj}" -- %endif %changelog +* Thu Oct 20 2016 Christopher Tubbs - 1.6.6-4 +- Fix whitespace in native patch for fuzz=0 opt in f25+ + * Thu Oct 20 2016 Christopher Tubbs - 1.6.6-3 - Remove animal sniffer enforcer rule diff --git a/native-code.patch b/native-code.patch index 607487e..d6eea5d 100644 --- a/native-code.patch +++ b/native-code.patch @@ -2,8 +2,8 @@ diff --git a/server/native/src/main/resources/Makefile b/server/native/src/main/ index 9ffeefe..102c253 100644 --- a/server/native/src/main/resources/Makefile +++ b/server/native/src/main/resources/Makefile -@@ -26,7 +26,7 @@ ifeq ($(shell uname),Linux) - JAVA_HOME=$(shell dirname "$$(dirname "$$(readlink -ef "$$(which javah)")")") +@@ -30,7 +30,7 @@ ifeq ($(shell uname),Linux) + JAVA_HOME=$(shell dirname "$$(dirname "$$(readlink -e "$$(which javah)")")") endif NATIVE_LIB := libaccumulo.so - CXXFLAGS=-g -fPIC -shared -O3 -Wall -I'$(JAVA_HOME)'/include -I'$(JAVA_HOME)'/include/linux -Ijavah $(USERFLAGS)