From ef0dfae9de06beccc4ba1b7008c62bbbd0e30d47 Mon Sep 17 00:00:00 2001 From: Date: Tue, 12 May 2009 23:49:25 -0700 Subject: [PATCH] Setup for next version (and fixes for util for RPM) --- ChangeLog | 1 + Makefile.am | 12 ++++++++---- configure.ac | 2 +- libmemcached/memcached.h | 2 +- support/libmemcached-fc.spec.in | 5 ++++- support/libmemcached.spec.in | 5 ++++- 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40310924..49aa276a 100644 --- 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 c2de2f6d..c5693638 100644 --- 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 ba496a49..4ae1b722 100644 --- 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 a8865a7b..a9c6a683 100644 --- 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 24ff9d40..2ad61dee 100644 --- 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 310f7ccd..36fd047d 100644 --- 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 -- 2.30.2