diff options
| author | Jakub Bogusz | 2006-04-17 01:08:30 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | 87884238eed3a17028d92ddd73c33c3f8d5d6898 (patch) | |
| tree | 911da7a4ff4b24c318faa6074288485a7f64d7d3 | |
| parent | 32e8db703f6399f96bc94a13026d3b41fc6d3a60 (diff) | |
| download | apr-compat-87884238eed3a17028d92ddd73c33c3f8d5d6898.zip apr-compat-87884238eed3a17028d92ddd73c33c3f8d5d6898.tar.gz | |
- updated to 1.2.7auto/th/apr-1_2_7-1
- switched bcond defaults after Ac branching (Linux >= 2.6 required now)
Changed files:
apr-compat.spec -> 1.47
| -rw-r--r-- | apr-compat.spec | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/apr-compat.spec b/apr-compat.spec index 8238ba8..1af38d0 100644 --- a/apr-compat.spec +++ b/apr-compat.spec @@ -1,23 +1,19 @@ # -# Conditional build (Linux 2.4 compat, switch after Ac): -%bcond_with epoll # use epoll() syscall (requires Linux 2.6) -%bcond_with sendfile64 # use sendfile64 on even if it requires Linux 2.6 -%bcond_with tcpnodelaycork # use TCP_NODELAY|TCP_CORK flags (requires Linux 2.6) +# 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) # -# Linux 2.4.32 supports sendfile64 only on i386 and mips (only 32-bit archs matter) -%ifnarch ppc sparc sparc64 -%define with_sendfile64 1 -%endif Summary: Apache Portable Runtime Summary(pl): Apache Portable Runtime - przenośna biblioteka uruchomieniowa Name: apr -Version: 1.2.6 +Version: 1.2.7 Release: 1 Epoch: 1 License: Apache v2.0 Group: Libraries Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 -# Source0-md5: b1948b5ff68cedae6d0406ae842274c1 +# Source0-md5: e77887dbafc515c63feac84686bcb3bc Patch0: %{name}-link.patch Patch1: %{name}-metuxmpm.patch Patch2: %{name}-no-epoll.patch @@ -29,6 +25,10 @@ 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 |