1.1 --- a/memcached/memcached.spec Wed Sep 21 14:10:37 2011 +0200 1.2 +++ b/memcached/memcached.spec Wed Sep 21 14:13:05 2011 +0200 1.3 @@ -37,7 +37,7 @@ 1.4 Group: System 1.5 License: GPL 1.6 Version: %{V_memcached} 1.7 -Release: 20110716 1.8 +Release: 20110914 1.9 1.10 # list of sources 1.11 Source0: http://memcached.googlecode.com/files/memcached-%{V_memcached}.tar.gz 1.12 @@ -47,10 +47,14 @@ 1.13 Patch0: memcached.patch 1.14 1.15 # build information 1.16 -BuildPreReq: OpenPKG, openpkg >= 20100101, gcc, make, perl, perl-openpkg 1.17 -PreReq: OpenPKG, openpkg >= 20100101 1.18 +Prefix: %{l_prefix} 1.19 +BuildRoot: %{l_buildroot} 1.20 +BuildPreReq: OpenPKG, openpkg >= 20060823, gcc, make, perl, perl-openpkg 1.21 +PreReq: OpenPKG, openpkg >= 20060823 1.22 BuildPreReq: libevent, sasl 1.23 PreReq: libevent, sasl 1.24 +AutoReq: no 1.25 +AutoReqProv: no 1.26 1.27 %description 1.28 Memcached is a high-performance, distributed memory object caching 1.29 @@ -80,6 +84,12 @@ 1.30 %setup -q -T -D -a 1 1.31 %setup -q -T -D -a 2 1.32 %patch -p0 1.33 + %{l_shtool} subst \ 1.34 + -e 's; *-Werror;;g' \ 1.35 + memcached-%{V_memcached}/configure 1.36 + %{l_shtool} subst \ 1.37 + -e 's;\(libdir="\${libdir}\)/\${isainfo_k};\1;g' \ 1.38 + libmemcached-%{V_libmemcached}/configure 1.39 1.40 %build 1.41 # build daemon 1.42 @@ -87,6 +97,7 @@ 1.43 libs="" 1.44 case "%{l_platform -t}" in 1.45 *-linux* ) libs="$libs -lrt" ;; 1.46 + *-sunos* ) libs="$libs -lsocket -lnsl" ;; 1.47 esac 1.48 CC="%{l_cc}" \ 1.49 CFLAGS="%{l_cflags -O}" \ 1.50 @@ -125,6 +136,8 @@ 1.51 %{l_prefix}/bin/perl-openpkg -d Cache-Memcached-%{V_cache_memcached} configure build 1.52 1.53 %install 1.54 + # remove build cruft 1.55 + rm -rf $RPM_BUILD_ROOT 1.56 1.57 # install daemon 1.58 ( cd memcached-%{V_memcached} 1.59 @@ -164,6 +177,7 @@ 1.60 %files -f files 1.61 1.62 %clean 1.63 + rm -rf $RPM_BUILD_ROOT 1.64 1.65 %post 1.66 # after upgrade, restart service