OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Feb-2006 20:06:57
Branch: HEAD Handle: 2006022119065700
Modified files:
openpkg-src/memcached memcached.spec
Log:
modifying package: memcached-1.1.12 20051011 -> 20060221
Summary:
Revision Changes Path
1.14 +12 -14 openpkg-src/memcached/memcached.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/memcached/memcached.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 memcached.spec
--- openpkg-src/memcached/memcached.spec 1 Jan 2006 13:16:34 -0000
1.13
+++ openpkg-src/memcached/memcached.spec 21 Feb 2006 19:06:57 -0000
1.14
@@ -24,7 +24,7 @@
# package versions
%define V_memcached 1.1.12
-%define V_libmemcache 1.2.4
+%define V_libmemcache 1.4.0.rc2
%define V_cache_memcached 1.14
# package information
@@ -38,7 +38,7 @@
Group: System
License: GPL
Version: %{V_memcached}
-Release: 20051011
+Release: 20060221
# list of sources
Source0:
http://www.danga.com/memcached/dist/memcached-%{V_memcached}.tar.gz
@@ -49,7 +49,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, pmk >= 0.9.2, perl
+BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, perl
PreReq: OpenPKG, openpkg >= 20040130
BuildPreReq: libevent
PreReq: libevent
@@ -61,8 +61,6 @@
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.
- FIXME:tho:18.01.2005: will not run on FreeBSD 4.10 as pmkfile for
- libmemcache not suitable for this system.
%track
prog memcached:memcached = {
@@ -78,7 +76,7 @@
prog memcached:libmemcache = {
version = %{V_libmemcache}
url = http://people.freebsd.org/~seanc/libmemcache/
- regex = libmemcache-(\d+\.\d+(\.\d+)*)\.tar\.bz2
+ regex = libmemcache-(\d+\.\d+(\.\d+)*(\.rc\d+)?)\.tar\.bz2
}
%prep
@@ -105,7 +103,13 @@
# build C client API
( cd libmemcache-%{V_libmemcache}
- %{l_prefix}/bin/pmk >/dev/null
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags}" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --disable-shared
%{l_make} %{l_mflags -O}
) || exit $?
@@ -129,13 +133,7 @@
# install C client API
( cd libmemcache-%{V_libmemcache}
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/lib \
- $RPM_BUILD_ROOT%{l_prefix}/include
- %{l_shtool} install -c -m 644 \
- libmemcache.a $RPM_BUILD_ROOT%{l_prefix}/lib/
- %{l_shtool} install -c -m 644 \
- memcache.h $RPM_BUILD_ROOT%{l_prefix}/include/
+ %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
) || exit $?
# install daemon run-command script
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
