From a397e6d2b5ceace14df3aa96fdbba65120026c31 Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Mon, 9 Apr 2012 01:36:27 -0700
Subject: [PATCH] Spec fixes.

---
 libmemcached/include.am      | 81 +++++++++++++++++-------------------
 support/libmemcached.spec.in |  2 +
 2 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 448a2e20..99663d30 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -6,48 +6,45 @@ libmemcached_libmemcached_la_SOURCES =
 
 include libmemcached/csl/include.am
 
-EXTRA_DIST+= \
-	     libmemcached/libmemcached_probes.d \
-	     libmemcached/memcached/README.txt
-
-nobase_include_HEADERS+= libmemcached/result.h
-nobase_include_HEADERS+= \
-			 libmemcached/memcached.h \
-			 libmemcached/memcached.hpp \
-			 libmemcached/util.h
-
-noinst_HEADERS+= \
-		 libmemcached/array.h \
-		 libmemcached/assert.hpp \
-		 libmemcached/backtrace.hpp \
-		 libmemcached/byteorder.h \
-		 libmemcached/common.h \
-		 libmemcached/connect.hpp \
-		 libmemcached/continuum.hpp \
-		 libmemcached/do.hpp \
-		 libmemcached/encoding_key.h \
-		 libmemcached/error.hpp \
-		 libmemcached/initialize_query.h \
-		 libmemcached/internal.h \
-		 libmemcached/io.h \
-		 libmemcached/io.hpp \
-		 libmemcached/is.h \
-		 libmemcached/key.hpp \
-		 libmemcached/libmemcached_probes.h \
-		 libmemcached/memcached/protocol_binary.h \
-		 libmemcached/memcached/vbucket.h \
-		 libmemcached/memory.h \
-		 libmemcached/namespace.h \
-		 libmemcached/options.hpp \
-		 libmemcached/response.h \
-		 libmemcached/sasl.hpp \
-		 libmemcached/server.hpp \
-		 libmemcached/server_instance.h \
-		 libmemcached/socket.hpp \
-		 libmemcached/string.hpp \
-		 libmemcached/udp.hpp \
-		 libmemcached/virtual_bucket.h \
-		 libmemcached/watchpoint.h
+EXTRA_DIST+= libmemcached/libmemcached_probes.d
+EXTRA_DIST+= libmemcached/memcached/README.txt
+
+nobase_include_HEADERS+= libmemcached/memcached.h
+nobase_include_HEADERS+= libmemcached/memcached.hpp
+nobase_include_HEADERS+= libmemcached/util.h
+
+noinst_HEADERS+= libmemcached/array.h 
+noinst_HEADERS+= libmemcached/assert.hpp 
+noinst_HEADERS+= libmemcached/backtrace.hpp 
+noinst_HEADERS+= libmemcached/byteorder.h 
+noinst_HEADERS+= libmemcached/common.h 
+noinst_HEADERS+= libmemcached/connect.hpp 
+noinst_HEADERS+= libmemcached/continuum.hpp 
+noinst_HEADERS+= libmemcached/do.hpp 
+noinst_HEADERS+= libmemcached/encoding_key.h 
+noinst_HEADERS+= libmemcached/error.hpp 
+noinst_HEADERS+= libmemcached/initialize_query.h 
+noinst_HEADERS+= libmemcached/internal.h 
+noinst_HEADERS+= libmemcached/io.h 
+noinst_HEADERS+= libmemcached/io.hpp 
+noinst_HEADERS+= libmemcached/is.h 
+noinst_HEADERS+= libmemcached/key.hpp 
+noinst_HEADERS+= libmemcached/libmemcached_probes.h 
+noinst_HEADERS+= libmemcached/memcached/protocol_binary.h 
+noinst_HEADERS+= libmemcached/memcached/vbucket.h 
+noinst_HEADERS+= libmemcached/memory.h 
+noinst_HEADERS+= libmemcached/namespace.h 
+noinst_HEADERS+= libmemcached/options.hpp 
+noinst_HEADERS+= libmemcached/response.h 
+noinst_HEADERS+= libmemcached/result.h
+noinst_HEADERS+= libmemcached/sasl.hpp 
+noinst_HEADERS+= libmemcached/server.hpp 
+noinst_HEADERS+= libmemcached/server_instance.h 
+noinst_HEADERS+= libmemcached/socket.hpp 
+noinst_HEADERS+= libmemcached/string.hpp 
+noinst_HEADERS+= libmemcached/udp.hpp 
+noinst_HEADERS+= libmemcached/virtual_bucket.h 
+noinst_HEADERS+= libmemcached/watchpoint.h
 
 lib_LTLIBRARIES+= libmemcached/libmemcached.la
 libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED
diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in
index e0f29d0a..f1a108b6 100644
--- a/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@ -199,6 +199,8 @@ you will need to install %{name}-devel.
 %{_includedir}/libmemcached-1.0/verbosity.h
 %{_includedir}/libmemcached-1.0/version.h
 %{_includedir}/libmemcached-1.0/visibility.h
+%{_includedir}/libhashkit-1.0/string.h
+%{_includedir}/libmemcached-1.0/encoding_key.h
 
 %{_libdir}/libhashkit.so
 %{_libdir}/libmemcached.so
-- 
2.30.2