Setup for next version (and fixes for util for RPM)

diff --git a/ChangeLog b/ChangeLog
index 40310924eb59465123b2cab56a715b9b8830ee79..49aa276a69395c1f6e331ba23c265c510982bc6a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 0.29
+  * Added new pooling mechanism.
   * MEMCACHED_BEHAVIOR_NO_BLOCK no longer also sets MEMCACHED_BEHAVIOR_BUFFER_REQUESTS
   * Updated generic rpm
 

diff --git a/Makefile.am b/Makefile.am
index c2de2f6d37e58a6163e8bfca1ec3c0b631dcbfdc..c569363824c167d1f1ff65fbc5af3940ca89a333 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,15 +15,19 @@ test-no-outputdiff:
        @(cd tests; ${MAKE} test-no-outputdiff)
 
 fedora:
+       rm ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
+       rm ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
        cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
        rpmbuild -ba support/libmemcached.spec
-       cp /home/brian/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-       cp /home/brian/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
+       cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
+       cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
 
 generic:
+       rm ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
+       rm ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
        cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
        rpmbuild -ba support/libmemcached.spec
-       cp /home/brian/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-       cp /home/brian/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
+       cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
+       cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
 
 rpm: all dist generic fedora

diff --git a/configure.ac b/configure.ac
index ba496a4970337a7c26c1efd2fd34d661cc84acc2..4ae1b722addfbbe247826d8e01393e918f623bac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ MEMCACHED_LIBRARY_NAME=libmemcached
 
 #release versioning
 MEMCACHED_MAJOR_VERSION=0
-MEMCACHED_MINOR_VERSION=28
+MEMCACHED_MINOR_VERSION=29
 MEMCACHED_MICRO_VERSION=0
 
 #API version

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index a8865a7b2943808db599a5969bd0e86114702227..a9c6a6835719d7ab5df623b8997d0f6212e8a59f 100644 (file)
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -42,7 +42,7 @@ struct memcached_continuum_item_st {
   uint32_t value;
 };
 
-#define LIBMEMCACHED_VERSION_STRING "0.28"
+#define LIBMEMCACHED_VERSION_STRING "0.29"
 
 struct memcached_analysis_st {
   uint64_t most_used_bytes;

diff --git a/support/libmemcached-fc.spec.in b/support/libmemcached-fc.spec.in
index 24ff9d401eebeeecb281db44d2f3bff89e6646d7..2ad61dee4e8d6846f498bf79ca0747dc5773484c 100644 (file)
--- a/support/libmemcached-fc.spec.in
+++ b/support/libmemcached-fc.spec.in
@@ -79,7 +79,10 @@ you will need to install %{name}-devel.
 %{_bindir}/mem*
 %exclude %{_libdir}/libmemcached.a
 %exclude %{_libdir}/libmemcached.la
+%exclude %{_libdir}/libmemcachedutil.a
+%exclude %{_libdir}/libmemcachedutil.la
 %{_libdir}/libmemcached.so.*
+%{_libdir}/libmemcachedutil.so.*
 %{_mandir}/man1/mem*
 
 
@@ -88,8 +91,8 @@ you will need to install %{name}-devel.
 %doc examples
 %{_includedir}/libmemcached
 %{_libdir}/libmemcached.so
+%{_libdir}/libmemcachedutil.so
 %{_libdir}/pkgconfig/libmemcached.pc
-%{_libdir}/libmemcached.so
 %{_mandir}/man3/libmemcached*.3.gz
 %{_mandir}/man3/memcached_*.3.gz
 

diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in
index 310f7ccdbadf4c584113ea8dbd40ce8bd586c25a..36fd047dba243b0d9d0ef54b1c3d3b90cef66fbf 100644 (file)
--- a/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@ -79,7 +79,10 @@ you will need to install %{name}-devel.
 %{_bindir}/mem*
 %exclude %{_libdir}/libmemcached.a
 %exclude %{_libdir}/libmemcached.la
+%exclude %{_libdir}/libmemcachedutil.a
+%exclude %{_libdir}/libmemcachedutil.la
 %{_libdir}/libmemcached.so.*
+%{_libdir}/libmemcachedutil.so.*
 %{_mandir}/man1/mem*
 
 
@@ -88,8 +91,8 @@ you will need to install %{name}-devel.
 %doc examples
 %{_includedir}/libmemcached
 %{_libdir}/libmemcached.so
+%{_libdir}/libmemcachedutil.so
 %{_libdir}/pkgconfig/libmemcached.pc
-%{_libdir}/libmemcached.so
 %{_mandir}/man3/libmemcached*.3.gz
 %{_mandir}/man3/memcached_*.3.gz