Author: glen Date: Thu Dec 7 01:09:06 2006 GMT Module: SPECS Tag: AC-branch ---- Log message: - 1.2.8 merge from HEAD
---- Files affected: SPECS: apr.spec (1.46.2.1 -> 1.46.2.2) ---- Diffs: ================================================================ Index: SPECS/apr.spec diff -u SPECS/apr.spec:1.46.2.1 SPECS/apr.spec:1.46.2.2 --- SPECS/apr.spec:1.46.2.1 Mon Apr 17 19:27:05 2006 +++ SPECS/apr.spec Thu Dec 7 02:09:01 2006 @@ -12,17 +12,17 @@ Summary: Apache Portable Runtime Summary(pl): Apache Portable Runtime - przenoĊna biblioteka uruchomieniowa Name: apr -Version: 1.2.7 +Version: 1.2.8 Release: 1 Epoch: 1 License: Apache v2.0 Group: Libraries Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 -# Source0-md5: e77887dbafc515c63feac84686bcb3bc +# Source0-md5: c573f1b3046991a2624002398b078ad5 Patch0: %{name}-link.patch Patch1: %{name}-metuxmpm.patch -Patch2: %{name}-no-epoll.patch -Patch3: %{name}-libtool.patch +Patch2: %{name}-libtool.patch +Patch3: %{name}-no-epoll.patch URL: http://apr.apache.org/ BuildRequires: autoconf >= 2.13 BuildRequires: automake @@ -87,8 +87,19 @@ %setup -q %patch0 -p1 %patch1 -p1 -%{!?with_epoll:%patch2 -p1} -%patch3 -p1 +%patch2 -p1 +%{!?with_epoll:%patch3 -p1} + +cat >> config.layout <<'EOF' +<Layout PLD> +sbindir: %{_sbindir} +libexecdir: %{_libdir}/apr +installbuilddir: ${datadir}/build-${APR_MAJOR_VERSION} +localstatedir: /var/run +runtimedir: /var/run +libsuffix: -${APR_MAJOR_VERSION} +</Layout PLD> +EOF %build install /usr/share/automake/config.* build @@ -96,13 +107,14 @@ %configure \ %{!?with_tcpnodelaycork:apr_cv_tcp_nodelay_with_cork=no} \ %{!?with_sendfile64:ac_cv_func_sendfile64=no} \ - --with-devrandom=/dev/urandom \ + --enable-layout=PLD \ %ifarch %{ix86} %{i8664} %ifnarch i386 --enable-nonportable-atomics \ %endif %endif - --enable-threads + --enable-threads \ + --with-devrandom=/dev/urandom %{__make} %install @@ -166,6 +178,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.46.2.2 2006/12/07 01:09:01 glen +- 1.2.8 merge from HEAD + Revision 1.46.2.1 2006/04/17 17:27:05 glen - 1.2.7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apr.spec?r1=1.46.2.1&r2=1.46.2.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
