rpms/pvm/devel pvm.spec,1.25,1.26

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/pvm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15365

Modified Files:
	pvm.spec 
Log Message:
fix bugs 155785, 158303


Index: pvm.spec
===================================================================
RCS file: /cvs/dist/rpms/pvm/devel/pvm.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- pvm.spec	8 Mar 2005 22:11:13 -0000	1.25
+++ pvm.spec	31 May 2005 22:41:56 -0000	1.26
@@ -76,20 +76,23 @@
 cp conf/LINUX64.m4 conf/LINUXPPC64.m4
 
 # Patch the LINUXX86_64.def file to look in lib64 dirs as well for libraries.
-for I in X86_64 ppc64 s390x; do
+for I in X86_64 PPC64 S390X; do
 perl -p -i -e "s|ARCHDLIB	=|ARCHDLIB	= -L/usr/lib64 -L/usr/X11R6/lib64|" conf/LINUX$I.def
 perl -p -i -e "s|ARCHLIB	=|ARCHLIB	= -L/usr/lib64 -L/usr/X11R6/lib64|" conf/LINUX$I.def
 done
 
-%define pvm_arch %(echo %{_os}%{_target_cpu} | tr 'a-z' 'A-Z')
+echo 'ARCHCFLAGS += -fPIC' >> conf/LINUXX86_64.def
+
+#%define pvm_arch %(echo %{_os}%{_target_cpu} | tr 'a-z' 'A-Z')
 %build
 PVM_ROOT=$RPM_BUILD_ROOT/usr/share/pvm3 \
-	PVM_ARCH=%{pvm_arch} \
+	PVM_ARCH=`/var/tmp/pvm-3.4.5-root/usr/share/pvm3/lib/pvmgetarch` \
 	PVM_DPATH=$RPM_BUILD_ROOT/usr/share/pvm3/lib/pvmd \
+	CFLAGS=-fPIC \
 	make -C $RPM_BUILD_ROOT/usr/share/pvm3 
 
 PVM_ROOT=$RPM_BUILD_ROOT/usr/share/pvm3 \
-	PVM_ARCH=%{pvm_arch} \
+	PVM_ARCH=`/var/tmp/pvm-3.4.5-root/usr/share/pvm3/lib/pvmgetarch` \
 	XPVM_ROOT=$RPM_BUILD_ROOT/usr/share/pvm3/xpvm \
 	make -C $RPM_BUILD_ROOT/usr/share/pvm3/xpvm XLIBDIR=-L%{_prefix}/X11R6/%{_lib} TCLTKHOME=%{_libdir} 
 
@@ -100,7 +103,7 @@
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 install -m 0755  $RPM_SOURCE_DIR/xpvm.sh $RPM_BUILD_ROOT/usr/bin/xpvm
 PVM_ROOT=$RPM_BUILD_ROOT/usr/share/pvm3 \
-	PVM_ARCH=%{pvm_arch} \
+	PVM_ARCH=`/var/tmp/pvm-3.4.5-root/usr/share/pvm3/lib/pvmgetarch` \
 	XPVM_ROOT=$RPM_BUILD_ROOT/usr/share/pvm3/xpvm \
 	make -C $RPM_BUILD_ROOT/usr/share/pvm3/xpvm install
 
@@ -199,7 +202,6 @@
 #    /usr/sbin/userdel pvm > /dev/null 2>&1
 #fi
 
-
 %triggerun -- pvm <= 3.4.3-25
 /sbin/chkconfig --del pvmd
 
@@ -220,6 +222,10 @@
 /usr/share/pvm3/xpvm/*
 
 %changelog
+* Tue May 31 2005 Jason Vas Dias<jvdias at redhat.com> 3.4.5-4
+- fix bug 155785: PVM_ARCH should be LINUX on i386, not LINUXI386
+- fix bug 158303: x86_64 build needs -fPIC
+
 * Tue Mar 08 2005 Jason Vas Dias<jvdias at redhat.com> 3.4.5-3_FC4
 - GCC4 build: fix forward declaration of Pvmtevdid (globals.h)