From 3cc4890cfb80d7199d4587c79da522662f6157bc Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@fedoraproject.org>
Date: Fri, 18 Jul 2008 21:33:29 +0000
Subject: use -fPIE for sparc arches add sparc64 to list of 64 bit arches

---
 bind.spec | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'bind.spec')

diff --git a/bind.spec b/bind.spec
index 56dfb4c..a7e6992 100644
--- a/bind.spec
+++ b/bind.spec
@@ -18,7 +18,7 @@ Summary: 	The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	33.%{PATCHVER}%{?dist}
+Release: 	34.%{PATCHVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -241,6 +241,12 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
 %patch91 -p1 -b .recv-race
 %patch92 -p1 -b .edns
 %patch93 -p1 -b .rh450995
+# Sparc and s390 arches need to use -fPIE                                                           
+%ifarch sparcv9 sparc64 s390 s390x
+for i in bin/named-sdb/unix/Makefile.in bin/named-sdb/Makefile.in bin/named/unix/Makefile.in bin/named/Makefile.in; do
+       sed -i 's|fpie|fPIE|g' $i
+done
+%endif
 :;
 
 
@@ -252,7 +258,7 @@ export STD_CDEFINES="$CPPFLAGS"
 libtoolize -c -f; aclocal --force; autoheader -f; autoconf -f
 
 %if %{WITH_DBUS}
-%ifarch s390x x86_64 ppc64
+%ifarch s390x x86_64 ppc64 sparc64
 # every 64-bit arch EXCEPT ia64 has dbus architecture dependant
 # includes in  /usr/lib64/dbus-1.0/include
 export DBUS_ARCHDEP_LIBDIR=lib64
@@ -286,7 +292,8 @@ fi
 %endif
 ;
 if [ -s openssl_config.h ]; then cat openssl_config.h >> config.h ; fi;
-make %{?_smp_mflags}
+make -j8
+#%{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -395,7 +402,7 @@ for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.int
   echo '@ in soa localhost. root 1 3H 15M 1W 1D
   ns localhost.' > sample/var/named/$f; 
 done
-/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.265 2008/07/08 22:23:45 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
+/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.266 2008/07/18 21:33:29 ausil Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
  *\
  * NOTE: you only need to create this file if it is to\
  * differ from the following default contents:
@@ -646,6 +653,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Fri Jul 18 2008 Dennis Gilmore <dennis@ausil.us> 32:9.5.0-34.P1
+- use fPIE on sparcv9/sparc64
+- add sparc64 to list of 64bit arches in spec
+
 * Tue Jul 08 2008 Adam Tkac <atkac redhat com> 32:9.5.0-33.P1
 - 9.5.0-P1 release (CVE-2008-1447)
 - fixed typo in bind-sdb summary (#454436)
-- 
cgit