packages: util-linux-ng/util-linux-ng.spec - bring ac into play

[glen]

Author: glen                         Date: Fri May  7 06:46:14 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- bring ac into play

---- Files affected:
packages/util-linux-ng:
   util-linux-ng.spec (1.64 -> 1.65) 

---- Diffs:

================================================================
Index: packages/util-linux-ng/util-linux-ng.spec
diff -u packages/util-linux-ng/util-linux-ng.spec:1.64 packages/util-linux-ng/util-linux-ng.spec:1.65
--- packages/util-linux-ng/util-linux-ng.spec:1.64	Thu Apr 29 08:51:43 2010
+++ packages/util-linux-ng/util-linux-ng.spec	Fri May  7 08:46:09 2010
@@ -2,11 +2,21 @@
 #
 # Conditional build:
 %bcond_without	initrd		# don't build initrd version
-%bcond_with	uClibc		# link initrd version with static glibc instead of uClibc
+%bcond_with		uClibc		# link initrd version with static glibc instead of uClibc
 %bcond_without	dietlibc	# link initrd version with dietlibc instead of uClibc
 %bcond_without	selinux 	# SELinux support
+%if "%{pld_release}" == "ac"
+%bcond_with		fallocate	# fallocate utility (needs glibc 2.11 to compile)
+%else
 %bcond_without	fallocate	# fallocate utility (needs glibc 2.11 to compile)
-#
+%endif
+
+%if "%{pld_release}" == "ac"
+%define		pam_ver 0.79.0
+%else
+%define		pam_ver 0.99.7.1
+%endif
+
 Summary:	Collection of basic system utilities for Linux
 Summary(de.UTF-8):	Sammlung von grundlegenden Systemdienstprogrammen für Linux
 Summary(es.UTF-8):	Colectánea de utilitarios básicos de sistema para Linux
@@ -42,8 +52,9 @@
 %{?with_selinux:BuildRequires:	libsepol-devel}
 BuildRequires:	libtool
 BuildRequires:	ncurses-devel >= 5.0
-BuildRequires:	pam-devel >= 0.99.7.1
+BuildRequires:	pam-devel >= %{pam_ver}
 BuildRequires:	pkgconfig
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.470
 BuildRequires:	sed >= 4.0
 BuildRequires:	texinfo
@@ -59,7 +70,7 @@
 		%endif
 	%endif
 %endif
-Requires:	pam >= 0.99.7.1
+Requires:	pam >= %{pam_ver}
 Provides:	fdisk
 Provides:	linux32
 Provides:	sparc32
@@ -338,7 +349,7 @@
 Summary:	login is used when signing onto a system
 Summary(pl.UTF-8):	login jest używany do rozpoczęcia pracy w systemie
 Group:		Applications/System
-Requires:	pam >= 0.99.7.1
+Requires:	pam >= %{pam_ver}
 Obsoletes:	heimdal-login
 
 %description -n login
@@ -1360,6 +1371,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65  2010/05/07 06:46:09  glen
+- bring ac into play
+
 Revision 1.64  2010/04/29 06:51:43  qboosh
 - libgcrypt/libgpg-error no longer used
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux-ng/util-linux-ng.spec?r1=1.64&r2=1.65&f=u