rpms/scalapack/EL-6 scalapack.spec,1.29,1.30

Tom Callaway spot at fedoraproject.org
Thu Jul 8 17:22:24 UTC 2010


Author: spot

Update of /cvs/pkgs/rpms/scalapack/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13014

Modified Files:
	scalapack.spec 
Log Message:
sync


Index: scalapack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scalapack/EL-6/scalapack.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- scalapack.spec	2 Feb 2010 15:21:21 -0000	1.29
+++ scalapack.spec	8 Jul 2010 17:22:24 -0000	1.30
@@ -18,7 +18,7 @@
 Summary: A subset of LAPACK routines redesigned for heterogenous computing
 Name: scalapack
 Version: 1.7.5
-Release: 8%{?dist}.2
+Release: 10%{?dist}
 # This is freely distributable without any restrictions.
 License: Public Domain
 Group: Development/Libraries
@@ -26,6 +26,8 @@ URL: http://www.netlib.org/lapack-dev/
 Source0: http://www.netlib.org/scalapack/scalapack-%{version}.tgz
 BuildRequires: lapack-devel, blas-devel
 BuildRequires: gcc-gfortran, glibc-devel
+BuildRequires: blacs-mpich2-devel, mpich2-devel-static
+BuildRequires: blacs-openmpi-devel, openmpi-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: scalapack-1.7-fedora.patch
 
@@ -90,12 +92,11 @@ This package contains common files which
 %package mpich2
 Summary: ScaLAPACK libraries compiled against mpich2
 Group: Development/Libraries
-BuildRequires: blacs-mpich2-devel, mpich2-devel-static
 Requires: %{name}-common = %{version}-%{release}
 Requires: environment-modules
 # This is a lie, but something needs to obsolete it.
 Provides: %{name}-lam = %{version}-%{release}
-Obsoletes: %{name}-lam < 1.7.5-8
+Obsoletes: %{name}-lam <= 1.7.5-7
 
 %description mpich2
 The ScaLAPACK (or Scalable LAPACK) library includes a subset
@@ -130,7 +131,7 @@ Summary: Development libraries for ScaLA
 Group: Development/Libraries
 Requires: %{name}-mpich2 = %{version}-%{release}
 Provides: %{name}-lam-devel = %{version}-%{release}
-Obsoletes: %{name}-lam-devel < 1.7.5-8
+Obsoletes: %{name}-lam-devel <= 1.7.5-7
 
 %description mpich2-devel
 This package contains development libraries for ScaLAPACK, compiled against mpich2.
@@ -139,7 +140,8 @@ This package contains development librar
 Summary: Static libraries for ScaLAPACK (mpich2)
 Group: Development/Libraries
 Provides: %{name}-lam-static = %{version}-%{release}
-Obsoletes: %{name}-lam-static < 1.7.5-8
+Obsoletes: %{name}-lam-static <= 1.7.5-7
+Requires: %{name}-mpich2-devel = %{version}-%{release}
 
 %description mpich2-static
 This package contains static libraries for ScaLAPACK, compiled against mpich2.
@@ -147,7 +149,6 @@ This package contains static libraries f
 %package openmpi
 Summary: ScaLAPACK libraries compiled against openmpi
 Group: Development/Libraries
-BuildRequires: blacs-openmpi-devel, openmpi-devel
 Requires: %{name}-common = %{version}-%{release}
 Requires: environment-modules
 
@@ -190,6 +191,7 @@ This package contains development librar
 %package openmpi-static
 Summary: Static libraries for ScaLAPACK (openmpi)
 Group: Development/Libraries
+Requires: %{name}-openmpi-devel = %{version}-%{release}
 
 %description openmpi-static
 This package contains static libraries for ScaLAPACK, compiled against openmpi.
@@ -301,12 +303,12 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/scalapack-openmpi/libscalapack.a
 
 %changelog
-* Tue Feb 02 2010 Deji Akingunola <dakingun at gmail.com> - 1.7.5-8.2
-- Adjust the Obsoletes conditional to fix the broken dependency issue
+* Wed Jul  7 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.5-10
+- Move all BuildRequires to the top of the spec file
+- -static packages now Require matching -devel package, they're not very useful otherwise
 
-* Wed Dec 15 2009 Deji Akingunola <dakingun at gmail.com> - 1.7.5-8.1
-- mpich2 and openmpi macros can now be sanely removed
-- Buildrequire mpich2-devel-static and rebuild for mpich2-1.2.1
+* Wed Dec 15 2009 Deji Akingunola <dakingun at gmail.com> - 1.7.5-9
+- Buildrequire mpich2-devel-static
 
 * Wed Dec  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.5-8
 - drop lam support (Provides/Obsoletes by mpich2, which is a hack, but something's gotta do it)



More information about the scm-commits mailing list