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

[Deji Akingunola]

Author: deji

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

Modified Files:
	blacs.spec 
Log Message:
* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-34.2
- mpich2 and openmpi macros can now be removed
- Buildrequire mpich2-devel-static and rebuild for mpich2-1.2.1
- Fix broken dep issue on F-12



Index: blacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blacs/F-12/blacs.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- blacs.spec	7 Dec 2009 20:54:55 -0000	1.35
+++ blacs.spec	10 Dec 2009 19:47:22 -0000	1.36
@@ -1,24 +1,7 @@
-# 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}.1
+Release: 34%{?dist}.2
 License: Public Domain
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -67,12 +50,12 @@ This file contains common files which ar
 %package mpich2
 Summary: BLACS libraries compiled against mpich2
 Group: Development/Libraries
-BuildRequires: mpich2-devel
+BuildRequires: mpich2-devel-static
 Requires: %{name}-common = %{version}-%{release}
 Requires: environment-modules
 # This is a dirty lie, but something needs to reap these dead subpackages.
 Provides: blacs-lam = %{version}-%{release}
-Obsoletes: blacs-lam < 1.1-33
+Obsoletes: blacs-lam <= 1.1-33
 
 %description mpich2
 The BLACS (Basic Linear Algebra Communication Subprograms) project is
@@ -92,7 +75,7 @@ Summary: Development libraries for blacs
 Group: Development/Libraries
 Requires: %{name}-mpich2 = %{version}-%{release}
 Provides: blacs-lam-devel = %{version}-%{release}
-Obsoletes: blacs-lam-devel < 1.1-33
+Obsoletes: blacs-lam-devel <= 1.1-33
 
 %description mpich2-devel
 This package contains development libraries for blacs, compiled against mpich2.
@@ -101,7 +84,7 @@ This package contains development librar
 Summary: Static libraries for blacs (mpich2)
 Group: Development/Libraries
 Provides: blacs-lam-static = %{version}-%{release}
-Obsoletes: blacs-lam-static < 1.1-33
+Obsoletes: blacs-lam-static <= 1.1-33
 
 %description mpich2-static
 This package contains static libraries for blacs, compiled against mpich2.
@@ -258,6 +241,11 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/blacs-openmpi/*.a
 
 %changelog
+* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-34.2
+- mpich2 and openmpi macros can now be removed
+- Buildrequire mpich2-devel-static and rebuild for mpich2-1.2.1
+- Fix broken dep issue on F-12
+
 * 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