Update build bits, include forgotten manpages.

diff --git a/Makefile.am b/Makefile.am
index 4d9d0531ddcaaf26e96bc576b41ec99af211c046..61bee31780e92cc580ce66a7e449482ca83fb12f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,7 +78,12 @@ generic: support/libmemcached.spec
        @cp ~/rpmbuild/RPMS/x86_64/libmemcached-debuginfo-$(VERSION)*.rpm .
        @cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
 
-rpm: man distcheck generic
+clean_rpm:
+       @rm -f *.tar.gz
+       @rm -f *.src.rpm
+       @rm -f *.rpm
+
+rpm: clean_rpm man distcheck generic
 
 release: rpm
        @rpm --addsign libmemcached-$(VERSION)*.rpm .

diff --git a/docs/include.am b/docs/include.am
index fd1cb592d547fd00945f4f5907863f94056232c8..070a36c3f95fc9183e0280609f715bbb53f42226 100644 (file)
--- a/docs/include.am
+++ b/docs/include.am
@@ -16,120 +16,123 @@ ALLSPHINXOPTS   = -d $(SPHINX_BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOP
 
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
 
-man_MANS+= \
-          docs/man/hashkit_clone.3 \
-          docs/man/hashkit_crc32.3 \
-          docs/man/hashkit_create.3 \
-          docs/man/hashkit_fnv1_32.3 \
-          docs/man/hashkit_fnv1_64.3 \
-          docs/man/hashkit_fnv1a_32.3 \
-          docs/man/hashkit_fnv1a_64.3 \
-          docs/man/hashkit_free.3 \
-          docs/man/hashkit_functions.3 \
-          docs/man/hashkit_hsieh.3 \
-          docs/man/hashkit_is_allocated.3 \
-          docs/man/hashkit_jenkins.3 \
-          docs/man/hashkit_md5.3 \
-          docs/man/hashkit_murmur.3 \
-          docs/man/hashkit_value.3 \
-          docs/man/libhashkit.3 \
-          docs/man/libmemcached.3 \
-          docs/man/libmemcached_examples.3 \
-          docs/man/libmemcachedutil.3 \
-          docs/man/memaslap.1 \
-          docs/man/memcached_add.3 \
-          docs/man/memcached_add_by_key.3 \
-          docs/man/memcached_analyze.3 \
-          docs/man/memcached_append.3 \
-          docs/man/memcached_append_by_key.3 \
-          docs/man/memcached_behavior_get.3 \
-          docs/man/memcached_behavior_set.3 \
-          docs/man/memcached_callback_get.3 \
-          docs/man/memcached_callback_set.3 \
-          docs/man/memcached_cas.3 \
-          docs/man/memcached_cas_by_key.3 \
-          docs/man/memcached_clone.3 \
-          docs/man/memcached_create.3 \
-          docs/man/memcached_decrement.3 \
-          docs/man/memcached_decrement_with_initial.3 \
-          docs/man/memcached_delete.3 \
-          docs/man/memcached_delete_by_key.3 \
-          docs/man/libmemcached_check_configuration.3 \
-          docs/man/libmemcached_configuration.3 \
-          docs/man/memcached.3 \
-          docs/man/memcached_destroy_sasl_auth_data.3 \
-          docs/man/memcached_dump.3 \
-          docs/man/memcached_exist.3 \
-          docs/man/memcached_exist_by_key.3 \
-          docs/man/memcached_fetch.3 \
-          docs/man/memcached_fetch_execute.3 \
-          docs/man/memcached_fetch_result.3 \
-          docs/man/memcached_flush_buffers.3 \
-          docs/man/memcached_free.3 \
-          docs/man/memcached_generate_hash.3 \
-          docs/man/memcached_generate_hash_value.3 \
-          docs/man/memcached_get.3 \
-          docs/man/memcached_get_by_key.3 \
-          docs/man/memcached_get_memory_allocators.3 \
-          docs/man/memcached_get_sasl_callbacks.3 \
-          docs/man/memcached_get_user_data.3 \
-          docs/man/memcached_increment.3 \
-          docs/man/memcached_increment_with_initial.3 \
-          docs/man/memcached_lib_version.3 \
-          docs/man/memcached_mget.3 \
-          docs/man/memcached_mget_by_key.3 \
-          docs/man/memcached_mget_execute.3  \
-          docs/man/memcached_mget_execute_by_key.3  \
-          docs/man/memcached_pool.3 \
-          docs/man/memcached_pool_behavior_get.3 \
-          docs/man/memcached_pool_behavior_set.3 \
-          docs/man/memcached_pool_create.3 \
-          docs/man/memcached_pool_destroy.3 \
-          docs/man/memcached_pool_fetch.3 \
-          docs/man/memcached_pool_pop.3 \
-          docs/man/memcached_pool_push.3 \
-          docs/man/memcached_pool_release.3 \
-          docs/man/memcached_pool_st.3 \
-          docs/man/memcached_prepend.3 \
-          docs/man/memcached_prepend_by_key.3 \
-          docs/man/memcached_quit.3 \
-          docs/man/memcached_replace.3 \
-          docs/man/memcached_replace_by_key.3 \
-          docs/man/memcached_last_error_message.3 \
-          docs/man/memcached_sasl_set_auth_data.3 \
-          docs/man/memcached_server_add.3 \
-          docs/man/memcached_server_count.3 \
-          docs/man/memcached_server_cursor.3 \
-          docs/man/memcached_server_list.3 \
-          docs/man/memcached_server_list_append.3 \
-          docs/man/memcached_server_list_count.3 \
-          docs/man/memcached_server_list_free.3 \
-          docs/man/memcached_server_push.3 \
-          docs/man/memcached_servers_parse.3 \
-          docs/man/memcached_set.3 \
-          docs/man/memcached_set_by_key.3 \
-          docs/man/memcached_set_memory_allocators.3 \
-          docs/man/memcached_set_sasl_callbacks.3 \
-          docs/man/memcached_set_user_data.3 \
-          docs/man/memcached_stat.3 \
-          docs/man/memcached_stat_execute.3 \
-          docs/man/memcached_stat_get_keys.3 \
-          docs/man/memcached_stat_get_value.3 \
-          docs/man/memcached_stat_servername.3 \
-          docs/man/memcached_strerror.3 \
-          docs/man/memcached_touch.3 \
-          docs/man/memcached_touch_by_key.3 \
-          docs/man/memcached_verbosity.3 \
-          docs/man/memcached_version.3 \
-          docs/man/memcapable.1 \
-          docs/man/memcat.1 \
-          docs/man/memcp.1 \
-          docs/man/memdump.1 \
-          docs/man/memerror.1 \
-          docs/man/memflush.1 \
-          docs/man/memrm.1 \
-          docs/man/memslap.1 \
-          docs/man/memstat.1
+man_MANS+= docs/man/hashkit_clone.3
+man_MANS+= docs/man/hashkit_crc32.3
+man_MANS+= docs/man/hashkit_create.3
+man_MANS+= docs/man/hashkit_fnv1_32.3
+man_MANS+= docs/man/hashkit_fnv1_64.3
+man_MANS+= docs/man/hashkit_fnv1a_32.3
+man_MANS+= docs/man/hashkit_fnv1a_64.3
+man_MANS+= docs/man/hashkit_free.3
+man_MANS+= docs/man/hashkit_functions.3
+man_MANS+= docs/man/hashkit_hsieh.3
+man_MANS+= docs/man/hashkit_is_allocated.3
+man_MANS+= docs/man/hashkit_jenkins.3
+man_MANS+= docs/man/hashkit_md5.3
+man_MANS+= docs/man/hashkit_murmur.3
+man_MANS+= docs/man/hashkit_value.3
+man_MANS+= docs/man/libhashkit.3
+man_MANS+= docs/man/libmemcached.3
+man_MANS+= docs/man/libmemcached_examples.3
+man_MANS+= docs/man/libmemcachedutil.3
+man_MANS+= docs/man/memaslap.1
+man_MANS+= docs/man/memcached_add.3
+man_MANS+= docs/man/memcached_add_by_key.3
+man_MANS+= docs/man/memcached_analyze.3
+man_MANS+= docs/man/memcached_append.3
+man_MANS+= docs/man/memcached_append_by_key.3
+man_MANS+= docs/man/memcached_behavior_get.3
+man_MANS+= docs/man/memcached_behavior_set.3
+man_MANS+= docs/man/memcached_callback_get.3
+man_MANS+= docs/man/memcached_callback_set.3
+man_MANS+= docs/man/memcached_cas.3
+man_MANS+= docs/man/memcached_cas_by_key.3
+man_MANS+= docs/man/memcached_clone.3
+man_MANS+= docs/man/memcached_create.3
+man_MANS+= docs/man/memcached_decrement.3
+man_MANS+= docs/man/memcached_decrement_with_initial.3
+man_MANS+= docs/man/memcached_delete.3
+man_MANS+= docs/man/memcached_delete_by_key.3
+man_MANS+= docs/man/libmemcached_check_configuration.3
+man_MANS+= docs/man/libmemcached_configuration.3
+man_MANS+= docs/man/memcached.3
+man_MANS+= docs/man/memcached_destroy_sasl_auth_data.3
+man_MANS+= docs/man/memcached_dump.3
+man_MANS+= docs/man/memcached_exist.3
+man_MANS+= docs/man/memcached_exist_by_key.3
+man_MANS+= docs/man/memcached_fetch.3
+man_MANS+= docs/man/memcached_fetch_execute.3
+man_MANS+= docs/man/memcached_fetch_result.3
+man_MANS+= docs/man/memcached_flush_buffers.3
+man_MANS+= docs/man/memcached_free.3
+man_MANS+= docs/man/memcached_generate_hash.3
+man_MANS+= docs/man/memcached_generate_hash_value.3
+man_MANS+= docs/man/memcached_get.3
+man_MANS+= docs/man/memcached_get_by_key.3
+man_MANS+= docs/man/memcached_get_memory_allocators.3
+man_MANS+= docs/man/memcached_get_sasl_callbacks.3
+man_MANS+= docs/man/memcached_get_user_data.3
+man_MANS+= docs/man/memcached_increment.3
+man_MANS+= docs/man/memcached_increment_with_initial.3
+man_MANS+= docs/man/memcached_lib_version.3
+man_MANS+= docs/man/memcached_mget.3
+man_MANS+= docs/man/memcached_mget_by_key.3
+man_MANS+= docs/man/memcached_mget_execute.3 
+man_MANS+= docs/man/memcached_mget_execute_by_key.3 
+man_MANS+= docs/man/memcached_pool.3
+man_MANS+= docs/man/memcached_pool_behavior_get.3
+man_MANS+= docs/man/memcached_pool_behavior_set.3
+man_MANS+= docs/man/memcached_pool_create.3
+man_MANS+= docs/man/memcached_pool_destroy.3
+man_MANS+= docs/man/memcached_pool_fetch.3
+man_MANS+= docs/man/memcached_pool_pop.3
+man_MANS+= docs/man/memcached_pool_push.3
+man_MANS+= docs/man/memcached_pool_release.3
+man_MANS+= docs/man/memcached_pool_st.3
+man_MANS+= docs/man/memcached_prepend.3
+man_MANS+= docs/man/memcached_prepend_by_key.3
+man_MANS+= docs/man/memcached_quit.3
+man_MANS+= docs/man/memcached_replace.3
+man_MANS+= docs/man/memcached_replace_by_key.3
+man_MANS+= docs/man/memcached_last_error_message.3
+man_MANS+= docs/man/memcached_sasl_set_auth_data.3
+man_MANS+= docs/man/memcached_server_add.3
+man_MANS+= docs/man/memcached_server_count.3
+man_MANS+= docs/man/memcached_server_cursor.3
+man_MANS+= docs/man/memcached_server_list.3
+man_MANS+= docs/man/memcached_server_list_append.3
+man_MANS+= docs/man/memcached_server_list_count.3
+man_MANS+= docs/man/memcached_server_list_free.3
+man_MANS+= docs/man/memcached_server_push.3
+man_MANS+= docs/man/memcached_servers_parse.3
+man_MANS+= docs/man/memcached_set.3
+man_MANS+= docs/man/memcached_set_by_key.3
+man_MANS+= docs/man/memcached_set_memory_allocators.3
+man_MANS+= docs/man/memcached_set_sasl_callbacks.3
+man_MANS+= docs/man/memcached_set_user_data.3
+man_MANS+= docs/man/memcached_stat.3
+man_MANS+= docs/man/memcached_stat_execute.3
+man_MANS+= docs/man/memcached_stat_get_keys.3
+man_MANS+= docs/man/memcached_stat_get_value.3
+man_MANS+= docs/man/memcached_stat_servername.3
+man_MANS+= docs/man/memcached_strerror.3
+man_MANS+= docs/man/memcached_touch.3
+man_MANS+= docs/man/memcached_touch_by_key.3
+man_MANS+= docs/man/memcached_verbosity.3
+man_MANS+= docs/man/memcached_version.3
+man_MANS+= docs/man/memcapable.1
+man_MANS+= docs/man/memexist.1
+man_MANS+= docs/man/memparse.1
+man_MANS+= docs/man/memping.1
+man_MANS+= docs/man/memcat.1
+man_MANS+= docs/man/memcp.1
+man_MANS+= docs/man/memdump.1
+man_MANS+= docs/man/memtouch.1
+man_MANS+= docs/man/memerror.1
+man_MANS+= docs/man/memflush.1
+man_MANS+= docs/man/memrm.1
+man_MANS+= docs/man/memslap.1
+man_MANS+= docs/man/memstat.1
 
 if HAVE_SPHINX
 sphinx-help:

diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in
index f1a108b643a078cb39e8d092c400319a8a99bc18..b422ba67bbb68cc6b16d0bdda6c70c7272e8d1b8 100644 (file)
--- a/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@ -47,8 +47,6 @@ you will need to install %{name}-devel.
 %setup -q
 
 %{__mkdir} examples
-#%{__cp} tests/*.{cc,h} examples/
-
 
 %build
 %configure
@@ -63,7 +61,7 @@ you will need to install %{name}-devel.
 %check
 # test suite cannot run in mock (same port use for memcache server on all arch)
 # 1 test seems to fail.. 
-#%{__make} test
+# %{__make} check
 
 
 %clean
@@ -96,16 +94,20 @@ you will need to install %{name}-devel.
 %{_libdir}/libmemcached.so.10
 %{_libdir}/libmemcachedprotocol.so.0
 %{_libdir}/libmemcachedutil.so.2
+%{_mandir}/man1/memaslap.1.gz
 %{_mandir}/man1/memcapable.1.gz
 %{_mandir}/man1/memcat.1.gz
 %{_mandir}/man1/memcp.1.gz
 %{_mandir}/man1/memdump.1.gz
 %{_mandir}/man1/memerror.1.gz
+%{_mandir}/man1/memexist.1.gz
 %{_mandir}/man1/memflush.1.gz
+%{_mandir}/man1/memparse.1.gz
+%{_mandir}/man1/memping.1.gz
 %{_mandir}/man1/memrm.1.gz
-%{_mandir}/man1/memaslap.1.gz
 %{_mandir}/man1/memslap.1.gz
 %{_mandir}/man1/memstat.1.gz
+%{_mandir}/man1/memtouch.1.gz
 
 
 %files devel
@@ -314,10 +316,12 @@ you will need to install %{name}-devel.
 
 
 %changelog
-* Fri Jan  8 2010 Brian Aker <brian@tangent.org> - 0.37-1
+* Tue May  22 2012 Brian Aker <brian@tangent.org> - 1.0.8
+
+* Fri Jan  8 2010 Brian Aker <brian@tangent.org> - 0.37
 - Modified to be explicit in install include files. 
 
-* Sat Apr 25 2009 Remi Collet <rpms@famillecollet.com> - 0.28-1
+* Sat Apr 25 2009 Remi Collet <rpms@famillecollet.com> - 0.28
 - Initial RPM from Brian Aker spec
 - create -devel subpackage
 - add %%post %%postun %%check section