rpms/blacs/F-12 blacs.spec,1.34,1.35

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/blacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9126

Modified Files:
	blacs.spec 
Log Message:
readd macros


Index: blacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blacs/F-12/blacs.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- blacs.spec	7 Dec 2009 20:37:10 -0000	1.34
+++ blacs.spec	7 Dec 2009 20:54:55 -0000	1.35
@@ -1,7 +1,24 @@
+# These macros will go away soon. Hopefully.
+%global _openmpi_load \
+ . /etc/profile.d/modules.sh; \
+ module load openmpi-%{_arch}; \
+ export CFLAGS="$CFLAGS %{optflags}";
+%global _openmpi_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload openmpi-%{_arch};
+
+%global _mpich2_load \
+ . /etc/profile.d/modules.sh; \
+ module load mpich2-%{__isa_bits}; \
+ export CFLAGS="$CFLAGS %{optflags}";
+%global _mpich2_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload mpich2-%{__isa_bits};
+
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 34%{?dist}
+Release: 34%{?dist}.1
 License: Public Domain
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -241,6 +258,9 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/blacs-openmpi/*.a
 
 %changelog
+* Mon Dec  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-34.1
+- readd macros to spec for F-12, only exit sanely in rawhide
+
 * Mon Dec  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-34
 - drop lam subpackages (fixes FTBFS, 539057)
 - blacs-mpich2-* now Provides/Obsoletes blacs-lam-*, this is a dirty lie, but we need something to do it