SPECS: apr.spec - updated to 1.2.7 - switched bcond defaults after...

[qboosh]

Author: qboosh                       Date: Mon Apr 17 01:08:36 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.2.7
- switched bcond defaults after Ac branching (Linux >= 2.6 required now)

---- Files affected:
SPECS:
   apr.spec (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: SPECS/apr.spec
diff -u SPECS/apr.spec:1.46 SPECS/apr.spec:1.47
--- SPECS/apr.spec:1.46	Tue Apr  4 07:43:10 2006
+++ SPECS/apr.spec	Mon Apr 17 03:08:30 2006
@@ -1,24 +1,20 @@
 # $Revision$, $Date$
 #
-# 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
@@ -30,6 +26,10 @@
 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
@@ -166,6 +166,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2006/04/17 01:08:30  qboosh
+- updated to 1.2.7
+- switched bcond defaults after Ac branching (Linux >= 2.6 required now)
+
 Revision 1.46  2006/04/04 05:43:10  qboosh
 - updated to 1.2.6, removed obsolete branch patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apr.spec?r1=1.46&r2=1.47&f=u