From f1399761f120cbdc3c4d311355a0807324cd60d2 Mon Sep 17 00:00:00 2001
From: Christopher Tubbs <ctubbsii@apache.org>
Date: Wed, 9 Jul 2014 17:04:36 -0400
Subject: [PATCH] Fix build for f20

---
 accumulo.spec     | 8 +++++++-
 native-code.patch | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/accumulo.spec b/accumulo.spec
index 52cc370..39d0230 100644
--- a/accumulo.spec
+++ b/accumulo.spec
@@ -9,7 +9,7 @@
 
 Name:     %{proj}
 Version:  1.6.0
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  A software platform for processing vast amounts of data
 License:  ASL 2.0
 Group:    Development/Libraries
@@ -408,7 +408,9 @@ install -p -m 644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}-monitor.service
 %doc NOTICE
 %dir %{_javadir}/%{name}
 %dir %{_libexecdir}/%{name}
+%if 0%{?fedora} > 20
 %dir %{_mavenpomdir}/%{name}
+%endif
 %{_libexecdir}/%{name}/%{name}
 %{_libexecdir}/%{name}/config.sh
 %{_bindir}/%{name}
@@ -523,5 +525,9 @@ getent passwd %{name} >/dev/null || /usr/sbin/useradd --comment "%{longproj}" --
 %endif
 
 %changelog
+* Wed Jul  9 2014 Christopher Tubbs <ctubbsii@apache> - 1.6.0-2
+- Add conditional for pom directory to build for f20
+- Remove fno-strict-aliasing flag based on upstream ACCUMULO-2762
+
 * Wed Apr 30 2014 Christopher Tubbs <ctubbsii@apache> - 1.6.0-1
 - Initial packaging
diff --git a/native-code.patch b/native-code.patch
index e315248..d2011df 100644
--- a/native-code.patch
+++ b/native-code.patch
@@ -20,7 +20,7 @@ index b9211aa..0e93467 100644
  	endif
  	NATIVE_LIB := libaccumulo.so
 -	CXXFLAGS=-g -fPIC -shared -O3 -Wall -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Ijavah $(USERFLAGS)
-+	CXXFLAGS=$(RPM_OPT_FLAGS) $(RPM_LD_FLAGS) -fPIC -shared -fno-strict-aliasing -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Ijavah $(USERFLAGS)
++	CXXFLAGS=$(RPM_OPT_FLAGS) $(RPM_LD_FLAGS) -fPIC -shared -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Ijavah $(USERFLAGS)
  endif
  
  ifeq ($(shell uname),Darwin)