From: Brian Aker <brian@tangent.org>
Date: Thu, 25 Oct 2012 16:33:18 +0000 (-0400)
Subject: Update support for fixing spec.
X-Git-Tag: 1.0.14~20^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=f4113de683e08a6305e6c4bcb7df94dd0c2802f7;p=m6w6%2Flibmemcached

Update support for fixing spec.
---

diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in
index 6660ac5d..1530ee5c 100644
--- a/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@ -113,18 +113,14 @@ you will need to install %{name}-devel.
 %exclude %{_libdir}/libmemcached.la
 %exclude %{_libdir}/libhashkit.la
 %exclude %{_libdir}/libmemcachedutil.la
-%exclude %{_libdir}/libmemcachedprotocol.la
 %exclude %{_libdir}/libmemcached.a
 %exclude %{_libdir}/libhashkit.a
 %exclude %{_libdir}/libmemcachedutil.a
-%exclude %{_libdir}/libmemcachedprotocol.a
 %{_libdir}/libhashkit.so.2.0.0
 %{_libdir}/libmemcached.so.11.0.0
 %{_libdir}/libmemcachedutil.so.2.0.0
-%{_libdir}/libmemcachedprotocol.so.0.0.0
 %{_libdir}/libhashkit.so.2
 %{_libdir}/libmemcached.so.11
-%{_libdir}/libmemcachedprotocol.so.0
 %{_libdir}/libmemcachedutil.so.2
 %{_mandir}/man1/memaslap.1.gz
 %{_mandir}/man1/memcapable.1.gz
@@ -160,11 +156,6 @@ you will need to install %{name}-devel.
 %{_includedir}/libhashkit-1.0/types.h
 %{_includedir}/libhashkit-1.0/visibility.h
 
-%{_includedir}/libmemcachedprotocol-0.0/binary.h
-%{_includedir}/libmemcachedprotocol-0.0/callback.h
-%{_includedir}/libmemcachedprotocol-0.0/handler.h
-%{_includedir}/libmemcachedprotocol-0.0/vbucket.h
-
 %{_includedir}/libmemcachedutil-1.0/util.h
 %{_includedir}/libmemcachedutil-1.0/flush.h
 %{_includedir}/libmemcachedutil-1.0/pid.h
@@ -239,7 +230,6 @@ you will need to install %{name}-devel.
 
 %{_libdir}/libhashkit.so
 %{_libdir}/libmemcached.so
-%{_libdir}/libmemcachedprotocol.so
 %{_libdir}/libmemcachedutil.so
 %{_libdir}/pkgconfig/libmemcached.pc
 %{_mandir}/man3/hashkit_clone.3.gz
diff --git a/tests/memdump.cc b/tests/memdump.cc
index f044844d..e34d1b08 100644
--- a/tests/memdump.cc
+++ b/tests/memdump.cc
@@ -67,7 +67,7 @@ static test_return_t server_test(void *)
   snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
   const char *args[]= { buffer, 0 };
 
-  test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
+  test_true(exec_cmdline(executable, args, true) <= EXIT_FAILURE);
 
   return TEST_SUCCESS;
 }
@@ -91,7 +91,7 @@ static test_return_t FOUND_test(void *)
   test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
   test_compare(MEMCACHED_SUCCESS, rc);
 
-  test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
+  test_true(exec_cmdline(executable, args, true) <= EXIT_FAILURE);
 
   memcached_free(memc);