- enable epoll, sendfile64, tcpnodelaycork for Th

Changed files:
    apr.spec -> 1.48

diff --git a/apr.spec b/apr.spec
index 1af38d0b2b11e75641fb7d270813abdfde0ea431..3eef83464c40b060100d67ae174be71b0c6a5866 100644 (file)
--- a/apr.spec
+++ b/apr.spec
@@ -1,14 +1,11 @@
 #
 # Conditional build:
-%bcond_without epoll           # don't use epoll() syscall (requires Linux 2.6)
-%bcond_without sendfile64      # don't use sendfile64 (requires Linux 2.6 on ppc/sparc*)
-%bcond_without tcpnodelaycork  # don't use TCP_NODELAY|TCP_CORK flags (requires Linux 2.6)
 #
 Summary:       Apache Portable Runtime
 Summary(pl):   Apache Portable Runtime - przeno¶na biblioteka uruchomieniowa
 Name:          apr
 Version:       1.2.7
-Release:       1
+Release:       2
 Epoch:         1
 License:       Apache v2.0
 Group:         Libraries
@@ -16,8 +13,7 @@ Source0:      http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
 # Source0-md5: e77887dbafc515c63feac84686bcb3bc
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-metuxmpm.patch
-Patch2:                %{name}-no-epoll.patch
-Patch3:                %{name}-libtool.patch
+Patch2:                %{name}-libtool.patch
 URL:           http://apr.apache.org/
 BuildRequires: autoconf >= 2.13
 BuildRequires: automake
@@ -25,10 +21,8 @@ BuildRequires:       libtool >= 1.3.3
 BuildRequires: libuuid-devel
 BuildRequires: sed >= 4.0
 BuildRequires: python
-%if %{with epoll} || %{with sendfile64} || %{with tcpnodelaycork}
 Conflicts:     kernel24
 Conflicts:     kernel24-smp
-%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _includedir     /usr/include/apr
@@ -86,15 +80,12 @@ Statyczna biblioteka apr.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%{!?with_epoll:%patch2 -p1}
-%patch3 -p1
+%patch2 -p1
 
 %build
 install /usr/share/automake/config.* build
 ./buildconf
 %configure \
-       %{!?with_tcpnodelaycork:apr_cv_tcp_nodelay_with_cork=no} \
-       %{!?with_sendfile64:ac_cv_func_sendfile64=no} \
        --with-devrandom=/dev/urandom \
 %ifarch %{ix86} %{i8664}
 %ifnarch i386