rpms/dhcp-forwarder/FC-4 dhcp-forwarder.spec,1.10,1.11

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/dhcp-forwarder/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1880/FC-4

Modified Files:
	dhcp-forwarder.spec 
Log Message:
do not build against dietlibc on non-i386 archs running FC3



Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/FC-4/dhcp-forwarder.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dhcp-forwarder.spec	8 Jun 2005 06:07:51 -0000	1.10
+++ dhcp-forwarder.spec	8 Jun 2005 16:09:48 -0000	1.11
@@ -2,12 +2,14 @@
 
 ## This package understands the following switches:
 ## --without dietlibc   ...   disable usage of dietlibc
+## --with    dietlibc   ...   enforce dietlibc usage on archs not supporting it
 ## --without minit      ...   disable creation of 'minit' subpackage
 ## --with    fedora     ...   enable fedora.us specific parts
 
+
 ## Fedora Extras specific customization below...
-%{!?_without_fedora:%global	_with_fedora	--with fedora}
-%{!?_with_minit:%global		_without_minit	--without minit}
+%{!?_without_fedora:%global	_with_fedora		--with fedora}
+%{!?_with_minit:%global		_without_minit		--without minit}
 ##
 
 
@@ -25,12 +27,18 @@
 %global service		dhcp-fwd
 
 
+%global have_dietlibc		%(case %_target_cpu in (i*86|athlon) true;; (*) test '%{?dist}' != .fc3;; esac && echo 1 || echo 0)
+%if ! %have_dietlibc
+%{!?_with_dietlibc:%global	_without_dietlibc	--without dietlibc}
+%endif
+
+
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Summary:	DHCP relay agent
 Name:		dhcp-forwarder
 Version:	0.7
-Release:	%release_func 6
+Release:	%release_func 7
 License:	GPL
 Group:		System Environment/Daemons
 URL:		http://www.tu-chemnitz.de/~ensc/dhcp-fwd
@@ -192,7 +200,8 @@
 
 
 %changelog
-* Tue Jun  7 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.7-6
+* Wed Jun  8 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.7-7
+- do not build against dietlibc on non-i386 archs running FC3
 - added sanity check for builds with mach
 - buildrequire 'which'