diff -r 6e491d7671a4 -r b3a1e74cc78b memcached/memcached.spec --- a/memcached/memcached.spec Tue Aug 28 18:35:40 2012 +0200 +++ b/memcached/memcached.spec Tue Aug 28 18:35:45 2012 +0200 @@ -22,8 +22,8 @@ ## # package versions -%define V_memcached 1.4.6 -%define V_libmemcached 0.48 +%define V_memcached 1.4.14 +%define V_libmemcached 1.0.10 %define V_cache_memcached 1.28 # package information @@ -37,7 +37,7 @@ Group: System License: GPL Version: %{V_memcached} -Release: 20110914 +Release: 20120800 # list of sources Source0: http://memcached.googlecode.com/files/memcached-%{V_memcached}.tar.gz @@ -47,17 +47,13 @@ Patch0: memcached.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20060823, gcc, make, perl, perl-openpkg -PreReq: OpenPKG, openpkg >= 20060823 -BuildPreReq: libevent, sasl -PreReq: libevent, sasl -AutoReq: no -AutoReqProv: no +BuildPreReq: OpenPKG, openpkg >= 20100101, gcc, make, perl, perl-openpkg +PreReq: OpenPKG, openpkg >= 20100101 +BuildPreReq: libevent, sasl, libexecinfo +PreReq: libevent, sasl, libexecinfo %description - Memcached is a high-performance, distributed memory object caching + Memcached is a high performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load. Additionally, this package contains Perl and C client APIs to memcached. @@ -85,6 +81,9 @@ %setup -q -T -D -a 2 %patch -p0 %{l_shtool} subst \ + -e 's/b = \(__sync_sub_and_fetch(\&a, 2);\)/return \1/' \ + memcached-%{V_memcached}/configure + %{l_shtool} subst \ -e 's; *-Werror;;g' \ memcached-%{V_memcached}/configure %{l_shtool} subst \ @@ -114,11 +113,19 @@ # build C client API ( cd libmemcached-%{V_libmemcached} + ( echo "ac_cv_func_malloc_0_nonnull=yes" + echo "ac_cv_func_realloc_0_nonnull=yes" + echo "ac_cv_env_CXXFLAGS_set=barf" + echo "ac_cv_env_CFLAGS_set=barf" + echo "ac_cv_header_priv_h=no" + echo "ac_cv_header_umem_h=no" + ) >config.cache CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ CPPFLAGS="%{l_cppflags}" \ LDFLAGS="%{l_ldflags}" \ ./configure \ + --cache-file=./config.cache \ --prefix=%{l_prefix} \ --mandir=%{l_prefix}/man \ --without-memcached \ @@ -136,9 +143,6 @@ %{l_prefix}/bin/perl-openpkg -d Cache-Memcached-%{V_cache_memcached} configure build %install - # remove build cruft - rm -rf $RPM_BUILD_ROOT - # install daemon ( cd memcached-%{V_memcached} %{l_shtool} mkdir -f -p -m 775 \ @@ -152,20 +156,30 @@ # install C client API ( cd libmemcached-%{V_libmemcached} - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" + %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT" + ) || exit $? + + # correct header names and references + ( cd $RPM_BUILD_ROOT%{l_prefix}/include + mv libmemcachedutil-[0-9]* libmemcachedutil + mv libmemcachedprotocol-[0-9]* libmemcachedprotocol + rm -rf libhashkit && mv libhashkit-[0-9]* libhashkit + rm -rf libmemcached && mv libmemcached-[0-9]* libmemcached + find . -type f -print | xargs %{l_shtool} subst \ + -e 's;\(#include