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: 02-Oct-2007 08:13:00
Branch: HEAD Handle: 2007100207130000
Modified files:
openpkg-src/memcached memcached.spec
Log:
modifying package: memcached-1.2.3 20070929 -> 20071002
Summary:
Revision Changes Path
1.29 +25 -4 openpkg-src/memcached/memcached.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/memcached/memcached.spec
============================================================================
$ cvs diff -u -r1.28 -r1.29 memcached.spec
--- openpkg-src/memcached/memcached.spec 29 Sep 2007 15:29:47 -0000
1.28
+++ openpkg-src/memcached/memcached.spec 2 Oct 2007 06:13:00 -0000
1.29
@@ -25,6 +25,7 @@
# package versions
%define V_memcached 1.2.3
%define V_libmemcache 1.4.0.rc2
+%define V_libmemcached 0.3
%define V_cache_memcached 1.24
# package information
@@ -38,13 +39,14 @@
Group: System
License: GPL
Version: %{V_memcached}
-Release: 20070929
+Release: 20071002
# list of sources
Source0:
http://www.danga.com/memcached/dist/memcached-%{V_memcached}.tar.gz
Source1:
http://www.cpan.org/authors/id/B/BR/BRADFITZ/Cache-Memcached-%{V_cache_memcached}.tar.gz
Source2:
http://people.freebsd.org/~seanc/libmemcache/libmemcache-%{V_libmemcache}.tar.bz2
-Source3: rc.memcached
+Source3:
http://download.tangent.org/libmemcached-%{V_libmemcached}.tar.gz
+Source4: rc.memcached
Patch0: memcached.patch
# build information
@@ -79,11 +81,17 @@
url = http://people.freebsd.org/~seanc/libmemcache/
regex = libmemcache-(\d+\.\d+(\.\d+)*(\.rc\d+)?)\.tar\.bz2
}
+ prog memcached:libmemcached = {
+ version = %{V_libmemcached}
+ url = http://tangent.org/552/libmemcached.html
+ regex = libmemcache-(__VER__)\.tar\.gz
+ }
%prep
%setup -q -c
%setup -q -T -D -a 1
%setup -q -T -D -a 2
+ %setup -q -T -D -a 3
%patch -p0 -d memcached-%{V_memcached}
%build
@@ -103,7 +111,7 @@
%{l_prefix}/bin/perl-openpkg prepare
%{l_prefix}/bin/perl-openpkg -d Cache-Memcached-%{V_cache_memcached}
configure build
- # build C client API
+ # build C client APIs
( cd libmemcache-%{V_libmemcache}
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
@@ -114,6 +122,16 @@
--disable-shared
%{l_make} %{l_mflags -O}
) || exit $?
+ ( cd libmemcached-%{V_libmemcached}
+ 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 $?
%install
rm -rf $RPM_BUILD_ROOT
@@ -133,10 +151,13 @@
%{l_prefix}/bin/perl-openpkg -d Cache-Memcached-%{V_cache_memcached}
install
%{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
- # install C client API
+ # install C client APIs
( cd libmemcache-%{V_libmemcache}
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
) || exit $?
+ ( cd libmemcached-%{V_libmemcached}
+ %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+ ) || exit $?
# install daemon run-command script
%{l_shtool} mkdir -f -p -m 755 \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
