[lapack] 3.4.0

Tom Callaway spot at fedoraproject.org
Tue Nov 29 20:33:35 UTC 2011


commit 9c6c13d85fc3d70a628ed61c15593203089281a7
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Tue Nov 29 15:33:21 2011 -0500

    3.4.0

 .gitignore                        |    1 +
 Makefile.lapack                   |   40 +++++++------
 lapack-3.4.0-lapacke-shared.patch |   35 +++++++++++
 lapack-3.4.0-make.inc.patch       |   15 +++++
 lapack.spec                       |  115 +++++++++++++++++++++++++++++--------
 sources                           |    4 +-
 6 files changed, 165 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 247fd8b..d864a06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ lapack-3.2.1.tgz
 manpages.tgz
 lapack-3.2.2.tgz
 /lapack-3.3.1.tgz
+/lapack-3.4.0.tgz
diff --git a/Makefile.lapack b/Makefile.lapack
index 10b5256..e28c7bc 100644
--- a/Makefile.lapack
+++ b/Makefile.lapack
@@ -7,8 +7,9 @@ SLASRC = sgbbrd.o sgbcon.o sgbequ.o sgbrfs.o sgbsv.o					\
    sgbsvx.o sgbtf2.o sgbtrf.o sgbtrs.o sgebak.o sgebal.o sgebd2.o			\
    sgebrd.o sgecon.o sgeequ.o sgees.o  sgeesx.o sgeev.o  sgeevx.o			\
    sgegs.o  sgegv.o  sgehd2.o sgehrd.o sgelq2.o sgelqf.o				\
-   sgels.o  sgelsd.o sgelss.o sgelsx.o sgelsy.o sgeql2.o sgeqlf.o			\
-   sgeqp3.o sgeqpf.o sgeqr2.o sgeqr2p.o sgeqrf.o sgeqrfp.o sgerfs.o sgerq2.o sgerqf.o	\
+   sgels.o  sgelsd.o sgelss.o sgelsx.o sgelsy.o sgemqrt.o sgeql2.o sgeqlf.o		\
+   sgeqp3.o sgeqpf.o sgeqr2.o sgeqr2p.o sgeqrf.o sgeqrfp.o sgeqrt.o sgeqrt2.o sgeqrt3.o	\
+   sgerfs.o sgerq2.o sgerqf.o								\
    sgesc2.o sgesdd.o sgesv.o  sgesvd.o sgesvx.o sgetc2.o sgetf2.o			\
    sgetrf.o sgetri.o									\
    sgetrs.o sggbak.o sggbal.o sgges.o  sggesx.o sggev.o  sggevx.o			\
@@ -49,7 +50,7 @@ SLASRC = sgbbrd.o sgbcon.o sgbequ.o sgbrfs.o sgbsv.o					\
    ssyswapr.o ssytrs.o ssytrs2.o ssyconv.o stbcon.o					\
    stbrfs.o stbtrs.o stgevc.o stgex2.o stgexc.o stgsen.o				\
    stgsja.o stgsna.o stgsy2.o stgsyl.o stpcon.o stprfs.o stptri.o			\
-   stptrs.o										\
+   stptrs.o stpmqrt.o stpqrt.o stpqrt2.o stprfb.o					\
    strcon.o strevc.o strexc.o strrfs.o strsen.o strsna.o strsyl.o			\
    strti2.o strtri.o strtrs.o stzrqf.o stzrzf.o sstemr.o				\
    slansf.o spftrf.o spftri.o spftrs.o ssfrk.o stfsm.o stftri.o stfttp.o		\
@@ -62,8 +63,9 @@ DLASRC = dgbbrd.o dgbcon.o dgbequ.o dgbrfs.o dgbsv.o					\
    dgbsvx.o dgbtf2.o dgbtrf.o dgbtrs.o dgebak.o dgebal.o dgebd2.o			\
    dgebrd.o dgecon.o dgeequ.o dgees.o  dgeesx.o dgeev.o  dgeevx.o			\
    dgegs.o  dgegv.o  dgehd2.o dgehrd.o dgelq2.o dgelqf.o				\
-   dgels.o  dgelsd.o dgelss.o dgelsx.o dgelsy.o dgeql2.o dgeqlf.o			\
-   dgeqp3.o dgeqpf.o dgeqr2.o dgeqr2p.o dgeqrf.o dgeqrfp.o dgerfs.o dgerq2.o dgerqf.o	\
+   dgels.o  dgelsd.o dgelss.o dgelsx.o dgelsy.o dgemqrt.o dgeql2.o dgeqlf.o		\
+   dgeqp3.o dgeqpf.o dgeqr2.o dgeqr2p.o dgeqrf.o dgeqrfp.o dgeqrt.o dgeqrt2.o dgeqrt3.o	\
+   dgerfs.o dgerq2.o dgerqf.o								\
    dgesc2.o dgesdd.o dgesv.o  dgesvd.o dgesvx.o dgetc2.o dgetf2.o			\
    dgetrf.o dgetri.o									\
    dgetrs.o dggbak.o dggbal.o dgges.o  dggesx.o dggev.o  dggevx.o			\
@@ -104,8 +106,8 @@ DLASRC = dgbbrd.o dgbcon.o dgbequ.o dgbrfs.o dgbsv.o					\
    dsytd2.o dsytf2.o dsytrd.o dsytrf.o dsytri.o dsytrs.o dsytrs2.o			\
    dsytri2.o dsytri2x.o dsyswapr.o dsyconv.o dtbcon.o					\
    dtbrfs.o dtbtrs.o dtgevc.o dtgex2.o dtgexc.o dtgsen.o				\
-   dtgsja.o dtgsna.o dtgsy2.o dtgsyl.o dtpcon.o dtprfs.o dtptri.o			\
-   dtptrs.o										\
+   dtgsja.o dtgsna.o dtgsy2.o dtgsyl.o dtpcon.o dtpmqrt.o dtpqrt.o dtpqrt2.o dtprfb.o	\
+   dtprfs.o dtptri.o dtptrs.o								\
    dtrcon.o dtrevc.o dtrexc.o dtrrfs.o dtrsen.o dtrsna.o dtrsyl.o			\
    dtrti2.o dtrtri.o dtrtrs.o dtzrqf.o dtzrzf.o dstemr.o				\
    dsgesv.o dsposv.o dlag2s.o slag2d.o dlat2s.o						\
@@ -119,8 +121,9 @@ CLASRC =    cbdsqr.o cgbbrd.o cgbcon.o cgbequ.o cgbrfs.o cgbsv.o  cgbsvx.o		\
    cgbtf2.o cgbtrf.o cgbtrs.o cgebak.o cgebal.o cgebd2.o cgebrd.o			\
    cgecon.o cgeequ.o cgees.o  cgeesx.o cgeev.o  cgeevx.o				\
    cgegs.o  cgegv.o  cgehd2.o cgehrd.o cgelq2.o cgelqf.o				\
-   cgels.o  cgelsd.o cgelss.o cgelsx.o cgelsy.o cgeql2.o cgeqlf.o cgeqp3.o		\
-   cgeqpf.o cgeqr2.o cgeqr2p.o cgeqrf.o cgeqrfp.o cgerfs.o cgerq2.o cgerqf.o		\
+   cgels.o  cgelsd.o cgelss.o cgelsx.o cgelsy.o cgemqrt.o cgeql2.o cgeqlf.o cgeqp3.o	\
+   cgeqpf.o cgeqr2.o cgeqr2p.o cgeqrf.o cgeqrfp.o cgeqrt.o cgeqrt2.o cgeqrt3.o cgerfs.o \
+   cgerq2.o cgerqf.o									\
    cgesc2.o cgesdd.o cgesv.o  cgesvd.o cgesvx.o cgetc2.o cgetf2.o cgetrf.o		\
    cgetri.o cgetrs.o									\
    cggbak.o cggbal.o cgges.o  cggesx.o cggev.o  cggevx.o cggglm.o			\
@@ -163,7 +166,7 @@ CLASRC =    cbdsqr.o cgbbrd.o cgbcon.o cgbequ.o cgbrfs.o cgbsv.o  cgbsvx.o		\
    csytri2.o csytri2x.o csyswapr.o							\
    csytrs.o csytrs2.o csyconv.o ctbcon.o ctbrfs.o ctbtrs.o ctgevc.o ctgex2.o		\
    ctgexc.o ctgsen.o ctgsja.o ctgsna.o ctgsy2.o ctgsyl.o ctpcon.o			\
-   ctprfs.o ctptri.o									\
+   ctprfs.o ctptri.o ctpmqrt.o ctpqrt.o ctpqrt2.o ctprfb.o				\
    ctptrs.o ctrcon.o ctrevc.o ctrexc.o ctrrfs.o ctrsen.o ctrsna.o			\
    ctrsyl.o ctrti2.o ctrtri.o ctrtrs.o ctzrqf.o ctzrzf.o cung2l.o cung2r.o		\
    cungbr.o cunghr.o cungl2.o cunglq.o cungql.o cungqr.o cungr2.o			\
@@ -179,8 +182,9 @@ ZLASRC = zbdsqr.o zgbbrd.o zgbcon.o zgbequ.o zgbrfs.o zgbsv.o  zgbsvx.o			\
    zgbtf2.o zgbtrf.o zgbtrs.o zgebak.o zgebal.o zgebd2.o zgebrd.o			\
    zgecon.o zgeequ.o zgees.o  zgeesx.o zgeev.o  zgeevx.o				\
    zgegs.o  zgegv.o  zgehd2.o zgehrd.o zgelq2.o zgelqf.o				\
-   zgels.o  zgelsd.o zgelss.o zgelsx.o zgelsy.o zgeql2.o zgeqlf.o zgeqp3.o		\
-   zgeqpf.o zgeqr2.o zgeqr2p.o zgeqrf.o zgeqrfp.o zgerfs.o zgerq2.o zgerqf.o		\
+   zgels.o  zgelsd.o zgelss.o zgelsx.o zgelsy.o zgemqrt.o zgeql2.o zgeqlf.o zgeqp3.o	\
+   zgeqpf.o zgeqr2.o zgeqr2p.o zgeqrf.o zgeqrfp.o zgeqrt.o zgeqrt2.o zgeqrt3.o		\
+   zgerfs.o zgerq2.o zgerqf.o								\
    zgesc2.o zgesdd.o zgesv.o  zgesvd.o zgesvx.o zgetc2.o zgetf2.o zgetrf.o		\
    zgetri.o zgetrs.o									\
    zggbak.o zggbal.o zgges.o  zggesx.o zggev.o  zggevx.o zggglm.o			\
@@ -225,8 +229,8 @@ ZLASRC = zbdsqr.o zgbbrd.o zgbcon.o zgbequ.o zgbrfs.o zgbsv.o  zgbsvx.o			\
    zsyr.o   zsyrfs.o zsysv.o  zsysvx.o zsytf2.o zsytrf.o zsytri.o			\
    zsytri2.o zsytri2x.o zsyswapr.o							\
    zsytrs.o zsytrs2.o zsyconv.o ztbcon.o ztbrfs.o ztbtrs.o ztgevc.o ztgex2.o		\
-   ztgexc.o ztgsen.o ztgsja.o ztgsna.o ztgsy2.o ztgsyl.o ztpcon.o			\
-   ztprfs.o ztptri.o									\
+   ztgexc.o ztgsen.o ztgsja.o ztgsna.o ztgsy2.o ztgsyl.o ztpcon.o ztpmqrt.o ztpqrt.o	\
+   ztpqrt2.o ztprfb.o ztprfs.o ztptri.o									\
    ztptrs.o ztrcon.o ztrevc.o ztrexc.o ztrrfs.o ztrsen.o ztrsna.o			\
    ztrsyl.o ztrti2.o ztrtri.o ztrtrs.o ztzrqf.o ztzrzf.o zung2l.o			\
    zung2r.o zungbr.o zunghr.o zungl2.o zunglq.o zungql.o zungqr.o zungr2.o		\
@@ -279,7 +283,7 @@ ALLAUX = ilaenv.o ieeeck.o lsamen.o  iparmq.o						\
     ../INSTALL/ilaver.o ../INSTALL/lsame.o xerbla.o xerbla_array.o
 
 SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o				\
-   sla_gercond.o sla_rpvgrw.o ssysvxx.o ssyrfsx.o					\
+   sla_gercond.o sla_gerpvgrw.o ssysvxx.o ssyrfsx.o					\
    sla_syrfsx_extended.o sla_syamv.o sla_syrcond.o sla_syrpvgrw.o			\
    sposvxx.o sporfsx.o sla_porfsx_extended.o sla_porcond.o				\
    sla_porpvgrw.o sgbsvxx.o sgbrfsx.o sla_gbrfsx_extended.o				\
@@ -287,7 +291,7 @@ SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o				\
    slascl2.o sla_wwaddw.o
 
 DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx_extended.o dla_geamv.o				\
-   dla_gercond.o dla_rpvgrw.o dsysvxx.o dsyrfsx.o					\
+   dla_gercond.o dla_gerpvgrw.o dsysvxx.o dsyrfsx.o					\
    dla_syrfsx_extended.o dla_syamv.o dla_syrcond.o dla_syrpvgrw.o			\
    dposvxx.o dporfsx.o dla_porfsx_extended.o dla_porcond.o				\
    dla_porpvgrw.o dgbsvxx.o dgbrfsx.o dla_gbrfsx_extended.o				\
@@ -295,7 +299,7 @@ DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx_extended.o dla_geamv.o				\
    dlascl2.o dla_wwaddw.o
 
 CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx_extended.o cla_geamv.o				\
-   cla_gercond_c.o cla_gercond_x.o cla_rpvgrw.o						\
+   cla_gercond_c.o cla_gercond_x.o cla_gerpvgrw.o					\
    csysvxx.o csyrfsx.o cla_syrfsx_extended.o cla_syamv.o				\
    cla_syrcond_c.o cla_syrcond_x.o cla_syrpvgrw.o					\
    cposvxx.o cporfsx.o cla_porfsx_extended.o						\
@@ -307,7 +311,7 @@ CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx_extended.o cla_geamv.o				\
    cla_lin_berr.o clarscl2.o clascl2.o cla_wwaddw.o
 
 ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o				\
-   zla_gercond_c.o zla_gercond_x.o zla_rpvgrw.o zsysvxx.o zsyrfsx.o			\
+   zla_gercond_c.o zla_gercond_x.o zla_gerpvgrw.o zsysvxx.o zsyrfsx.o			\
    zla_syrfsx_extended.o zla_syamv.o zla_syrcond_c.o zla_syrcond_x.o			\
    zla_syrpvgrw.o zposvxx.o zporfsx.o zla_porfsx_extended.o				\
    zla_porcond_c.o zla_porcond_x.o zla_porpvgrw.o zgbsvxx.o zgbrfsx.o			\
diff --git a/lapack-3.4.0-lapacke-shared.patch b/lapack-3.4.0-lapacke-shared.patch
new file mode 100644
index 0000000..c8ea2d4
--- /dev/null
+++ b/lapack-3.4.0-lapacke-shared.patch
@@ -0,0 +1,35 @@
+diff -up lapack-3.4.0/lapacke/Makefile.fedora lapack-3.4.0/lapacke/Makefile
+--- lapack-3.4.0/lapacke/Makefile.fedora	2011-11-29 09:13:01.433799657 -0500
++++ lapack-3.4.0/lapacke/Makefile	2011-11-29 09:15:03.035199954 -0500
+@@ -48,6 +48,9 @@ lapacke:
+ 	cd src && $(MAKE)
+ 	cd utils && $(MAKE)
+ 
++shlib: lapacke
++	$(CC) $(CFLAGS) -shared -Wl,-soname,$(SHLIB_LAPACKE). at SHORTVER@ -o $(SHLIB_LAPACKE). at LONGVER@ src/*.o utils/*.o $(LIBS) -lgfortran -lc
++
+ clean: cleanlib
+ 
+ cleanlib:
+diff -up lapack-3.4.0/lapacke/make.inc.fedora lapack-3.4.0/lapacke/make.inc
+--- lapack-3.4.0/lapacke/make.inc.fedora	2011-11-29 09:11:35.717927221 -0500
++++ lapack-3.4.0/lapacke/make.inc	2011-11-29 09:17:08.068555023 -0500
+@@ -50,14 +50,14 @@
+ CC = gcc
+ CFLAGS =
+ LINKER = gfortran
+-LDFLAGS =
++LDFLAGS = $(RPM_LD_FLAGS)
+ #
+ # The name of the libraries to be created/linked to
+ # Ensure that the libraries have the same data model (LP64/ILP64).
+ #
+-LAPACKE = lapacke.a
+-LIBS =  /Users/julie/Documents/Boulot/lapack-dev/lapack/trunk/lapack_LINUX.a \
+-        /Users/julie/Documents/Boulot/lapack-dev/lapack/trunk/blas_LINUX.a  -lm
++LAPACKE = liblapacke.a
++SHLIB_LAPACKE = liblapacke.so
++LIBS = -L.. -llapack -lblas -lm
+ #  The archiver and the flag(s) to use when building archive (library)
+ #  If your system has no ranlib, set RANLIB = echo.
+ #
diff --git a/lapack-3.4.0-make.inc.patch b/lapack-3.4.0-make.inc.patch
new file mode 100644
index 0000000..79d680c
--- /dev/null
+++ b/lapack-3.4.0-make.inc.patch
@@ -0,0 +1,15 @@
+diff -up lapack-3.4.0/INSTALL/make.inc.gfortran.orig lapack-3.4.0/INSTALL/make.inc.gfortran
+--- lapack-3.4.0/INSTALL/make.inc.gfortran.orig	2011-11-11 16:08:04.000000000 -0500
++++ lapack-3.4.0/INSTALL/make.inc.gfortran	2011-11-28 14:56:08.990672240 -0500
+@@ -13,9 +13,9 @@ SHELL = /bin/sh
+ #  desired load options for your machine.
+ #
+ FORTRAN  = gfortran 
+-OPTS     = -O2
++#OPTS     = -O2
+ DRVOPTS  = $(OPTS)
+-NOOPT    = -O0
++NOOPT    = 
+ LOADER   = gfortran
+ LOADOPTS =
+ #
diff --git a/lapack.spec b/lapack.spec
index 4865e19..6d4baa5 100644
--- a/lapack.spec
+++ b/lapack.spec
@@ -1,9 +1,9 @@
 %global shortver	3
-%global mediumver	%{shortver}.3
+%global mediumver	%{shortver}.4
 
 Summary: Numerical linear algebra package libraries
 Name: lapack
-Version: %{mediumver}.1
+Version: %{mediumver}.0
 Release: 1%{?dist}
 License: BSD
 Group: Development/Libraries
@@ -14,7 +14,8 @@ Source2: Makefile.blas
 Source3: Makefile.lapack
 Source4: http://www.netlib.org/lapack/lapackqref.ps
 Source5: http://www.netlib.org/blas/blasqr.ps
-Patch3: lapack-3.1.1-make.inc.patch
+Patch3: lapack-3.4.0-make.inc.patch
+Patch4: lapack-3.4.0-lapacke-shared.patch
 BuildRequires: gcc-gfortran
 
 %description
@@ -33,8 +34,8 @@ is coded in Fortran90 and built with gcc.
 %package devel
 Summary: LAPACK development libraries
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: blas-devel = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: blas-devel%{?_isa} = %{version}-%{release}
 
 %description devel
 LAPACK development libraries (shared).
@@ -42,7 +43,7 @@ LAPACK development libraries (shared).
 %package static
 Summary: LAPACK static libraries
 Group: Development/Libraries
-Requires: lapack-devel = %{version}-%{release}
+Requires: lapack-devel%{?_isa} = %{version}-%{release}
 
 %description static
 LAPACK static libraries.
@@ -58,7 +59,7 @@ provides a number of basic algorithms for numerical algebra.
 %package -n blas-devel
 Summary: BLAS development libraries
 Group: Development/Libraries
-Requires: blas = %{version}-%{release}
+Requires: blas%{?_isa} = %{version}-%{release}
 Requires: gcc-gfortran
 
 %description -n blas-devel
@@ -67,7 +68,7 @@ BLAS development libraries (shared).
 %package -n blas-static
 Summary: BLAS static libraries
 Group: Development/Libraries
-Requires: blas-devel = %{version}-%{release}
+Requires: blas-devel%{?_isa} = %{version}-%{release}
 
 %description -n blas-static
 BLAS static libraries.
@@ -75,21 +76,24 @@ BLAS static libraries.
 %prep
 %setup -q 
 %setup -q -D -T -a1
-%patch3 -p1
+%patch3 -p1 -b .fedora
+%patch4 -p1 -b .shared
+
+mkdir manpages
+mv man/ manpages/
+
 cp -f INSTALL/make.inc.gfortran make.inc
 cp -f %{SOURCE2} BLAS/SRC/Makefile
 cp -f %{SOURCE3} SRC/Makefile
 
 sed -i "s|@SHORTVER@|%{shortver}|g" BLAS/SRC/Makefile
 sed -i "s|@SHORTVER@|%{shortver}|g" SRC/Makefile
+sed -i "s|@SHORTVER@|%{shortver}|g" lapacke/Makefile
 sed -i "s|@LONGVER@|%{version}|g" BLAS/SRC/Makefile
 sed -i "s|@LONGVER@|%{version}|g" SRC/Makefile
-
-#Empty
-rm -f manpages/man/manl/zbcon.l
+sed -i "s|@LONGVER@|%{version}|g" lapacke/Makefile
 
 %build
-
 RPM_OPT_O_FLAGS=$(echo $RPM_OPT_FLAGS | sed 's|-O2|-O0|')
 export FC=gfortran
 
@@ -143,27 +147,78 @@ make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" shared
 cp liblapack.so.%{version} ${RPM_BUILD_DIR}/%{name}-%{version}/
 popd
 
+ln -s liblapack.so.%{version} liblapack.so
+
+# Build the lapacke libraries
+pushd lapacke
+make clean
+make CFLAGS="$RPM_OPT_FLAGS" lapacke
+cp liblapacke.a ${RPM_BUILD_DIR}/%{name}-%{version}/
+make clean
+make CFLAGS="$RPM_OPT_FLAGS -fPIC" shlib
+cp liblapacke.so.%{version} ${RPM_BUILD_DIR}/%{name}-%{version}/
+popd
+
 cp -p %{SOURCE4} lapackqref.ps
 cp -p %{SOURCE5} blasqr.ps
 
 %install
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/manl
-chmod 755 ${RPM_BUILD_ROOT}%{_mandir}/manl
+mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3
+chmod 755 ${RPM_BUILD_ROOT}%{_mandir}/man3
 
-for f in liblapack.so.%{version} libblas.so.%{version} libblas.a liblapack.a liblapack_pic.a; do
+for f in liblapack.so.%{version} libblas.so.%{version} liblapacke.so.%{version} libblas.a liblapack.a liblapack_pic.a liblapacke.a; do
   cp -f $f ${RPM_BUILD_ROOT}%{_libdir}/$f
 done
 
-find manpages/blas/man/manl -type f -printf "%{_mandir}/manl/%f*\n" > blasmans
+# Blas manpages
+pushd manpages/
+mkdir -p blas/man/man3
+cd man/man3/
+mv caxpy.f.3 CAXPY.3 ccopy.f.3 CCOPY.3 cdotc.f.3 CDOTC.3 cdotu.f.3 CDOTU.3 cgbmv.f.3 CGBMV.3 \
+cgemm.f.3 CGEMM.3 cgemv.f.3 CGEMV.3 cgerc.f.3 CGERC.3 cgeru.f.3 CGERU.3 chbmv.f.3 CHBMV.3 \
+chemm.f.3 CHEMM.3 chemv.f.3 CHEMV.3 cher.f.3 CHER.3 cher2.f.3 CHER2.3 cher2k.f.3 CHER2K.3 \
+cherk.f.3 CHERK.3 chpmv.f.3 CHPMV.3 chpr.f.3 CHPR.3 chpr2.f.3 CHPR2.3 crotg.f.3 CROTG.3 \
+cscal.f.3 CSCAL.3 csrot.f.3 CSROT.3 csscal.f.3 CSSCAL.3 cswap.f.3 CSWAP.3 csymm.f.3 \
+CSYMM.3 csyr2k.f.3 CSYR2K.3 csyrk.f.3 CSYRK.3 ctbmv.f.3 CTBMV.3 ctbsv.f.3 CTBSV.3 ctpmv.f.3 \
+CTPMV.3 ctpsv.f.3 CTPSV.3 ctrmm.f.3 CTRMM.3 ctrmv.f.3 CTRMV.3 ctrsm.f.3 CTRSM.3 ctrsv.f.3 \
+CTRSV.3 dasum.f.3 DASUM.3 daxpy.f.3 DAXPY.3 dcabs1.f.3 DCABS1.3 dcopy.f.3 DCOPY.3 ddot.f.3 \
+DDOT.3 dgbmv.f.3 DGBMV.3 dgemm.f.3 DGEMM.3 dgemv.f.3 DGEMV.3 dger.f.3 DGER.3 dnrm2.f.3 \
+DNRM2.3 drot.f.3 DROT.3 drotg.f.3 DROTG.3 drotm.f.3 DROTM.3 drotmg.f.3 DROTMG.3 dsbmv.f.3 \
+DSBMV.3 dscal.f.3 DSCAL.3 dsdot.f.3 DSDOT.3 dspmv.f.3 DSPMV.3 dspr.f.3 DSPR.3 dspr2.f.3 \
+DSPR2.3 dswap.f.3 DSWAP.3 dsymm.f.3 DSYMM.3 dsymv.f.3 DSYMV.3 dsyr.f.3 DSYR.3 dsyr2.f.3 \
+DSYR2.3 dsyr2k.f.3 DSYR2K.3 dsyrk.f.3 DSYRK.3 dtbmv.f.3 DTBMV.3 dtbsv.f.3 DTBSV.3 dtpmv.f.3 \
+DTPMV.3 dtpsv.f.3 DTPSV.3 dtrmm.f.3 DTRMM.3 dtrmv.f.3 DTRMV.3 dtrsm.f.3 DTRSM.3 dtrsv.f.3 \
+DTRSV.3 dzasum.f.3 DZASUM.3 dznrm2.f.3 DZNRM2.3 icamax.f.3 ICAMAX.3 idamax.f.3 IDAMAX.3 \
+isamax.f.3 ISAMAX.3 izamax.f.3 IZAMAX.3 LSAME.3 sasum.f.3 SASUM.3 saxpy.f.3 SAXPY.3 \
+scabs1.f.3 SCABS1.3 scasum.f.3 SCASUM.3 scnrm2.f.3 SCNRM2.3 scopy.f.3 SCOPY.3 sdot.f.3 SDOT.3 \
+sdsdot.f.3 SDSDOT.3 sgbmv.f.3 SGBMV.3 sgemm.f.3 SGEMM.3 sgemv.f.3 SGEMV.3 sger.f.3 SGER.3 \
+snrm2.f.3 SNRM2.3 srot.f.3 SROT.3 srotg.f.3 SROTG.3 srotm.f.3 SROTM.3 srotmg.f.3 SROTMG.3 \
+ssbmv.f.3 SSBMV.3 sscal.f.3 SSCAL.3 sspmv.f.3 SSPMV.3 sspr.f.3 SSPR.3 sspr2.f.3 SSPR2.3 \
+sswap.f.3 SSWAP.3 ssymm.f.3 SSYMM.3 ssymv.f.3 SSYMV.3 ssyr.f.3 SSYR.3 ssyr2.f.3 SSYR2.3 \
+ssyr2k.f.3 SSYR2K.3 ssyrk.f.3 SSYRK.3 stbmv.f.3 STBMV.3 stbsv.f.3 STBSV.3 stpmv.f.3 STPMV.3 \
+stpsv.f.3 STPSV.3 strmm.f.3 STRMM.3 strmv.f.3 STRMV.3 strsm.f.3 STRSM.3 strsv.f.3 STRSV.3 \
+XERBLA.3 XERBLA_ARRAY.3 zaxpy.f.3 ZAXPY.3 zcopy.f.3 ZCOPY.3 \
+zdotc.f.3 ZDOTC.3 zdotu.f.3 ZDOTU.3 zdrot.f.3 ZDROT.3 zdscal.f.3 ZDSCAL.3 zgbmv.f.3 ZGBMV.3 \
+zgemm.f.3 ZGEMM.3 zgemv.f.3 ZGEMV.3 zgerc.f.3 ZGERC.3 zgeru.f.3 ZGERU.3 zhbmv.f.3 ZHBMV.3 \
+zhemm.f.3 ZHEMM.3 zhemv.f.3 ZHEMV.3 zher.f.3 ZHER.3 zher2.f.3 ZHER2.3 zher2k.f.3 ZHER2K.3 \
+zherk.f.3 ZHERK.3 zhpmv.f.3 ZHPMV.3 zhpr.f.3 ZHPR.3 zhpr2.f.3 ZHPR2.3 zrotg.f.3 ZROTG.3 \
+zscal.f.3 ZSCAL.3 zswap.f.3 ZSWAP.3 zsymm.f.3 ZSYMM.3 zsyr2k.f.3 ZSYR2K.3 zsyrk.f.3 ZSYRK.3 \
+ztbmv.f.3 ZTBMV.3 ztbsv.f.3 ZTBSV.3 ztpmv.f.3 ZTPMV.3 ztpsv.f.3 ZTPSV.3 ztrmm.f.3 ZTRMM.3 \
+ztrmv.f.3 ZTRMV.3 ztrsm.f.3 ZTRSM.3 ztrsv.f.3 ZTRSV.3 ../../blas/man/man3
+cd ../..
+popd
+
+find manpages/blas/man/man3 -type f -printf "%{_mandir}/man3/%f*\n" > blasmans
+
+find manpages/man/man3 -type f -printf "%{_mandir}/man3/%f*\n" > lapackmans
 
-# These are also in the BLAS package
-rm -f manpages/man/manl/lsame.l*
-rm -f manpages/man/manl/xerbla.l*
-find manpages/man/manl -type f -printf "%{_mandir}/manl/%f*\n" > lapackmans
+cp -f manpages/blas/man/man3/* ${RPM_BUILD_ROOT}%{_mandir}/man3
+cp -f manpages/man/man3/* ${RPM_BUILD_ROOT}%{_mandir}/man3
 
-cp -f manpages/blas/man/manl/* ${RPM_BUILD_ROOT}%{_mandir}/manl
-cp -f manpages/man/manl/* ${RPM_BUILD_ROOT}%{_mandir}/manl
+# Lapacke headers
+mkdir -p %{buildroot}%{_includedir}/lapacke/
+cp -a lapacke/include/*.h %{buildroot}%{_includedir}/lapacke/
 
 cd ${RPM_BUILD_ROOT}%{_libdir}
 ln -sf liblapack.so.%{version} liblapack.so
@@ -172,6 +227,9 @@ ln -sf liblapack.so.%{version} liblapack.so.%{mediumver}
 ln -sf libblas.so.%{version} libblas.so
 ln -sf libblas.so.%{version} libblas.so.%{shortver}
 ln -sf libblas.so.%{version} libblas.so.%{mediumver}
+ln -sf liblapacke.so.%{version} liblapacke.so
+ln -sf liblapacke.so.%{version} liblapacke.so.%{shortver}
+ln -sf liblapacke.so.%{version} liblapacke.so.%{mediumver}
 
 %post -p /sbin/ldconfig
 
@@ -183,18 +241,21 @@ ln -sf libblas.so.%{version} libblas.so.%{mediumver}
 
 %files -f lapackmans
 %doc README LICENSE lapackqref.ps
-%dir %{_mandir}/manl/
+%dir %{_mandir}/man3/
 %{_libdir}/liblapack.so.*
+%{_libdir}/liblapacke.so.*
 
 %files devel
+%{_includedir}/lapacke/
 %{_libdir}/liblapack.so
+%{_libdir}/liblapacke.so
 
 %files static
 %{_libdir}/liblapack*.a
 
 %files -n blas -f blasmans
 %doc blasqr.ps LICENSE
-%dir %{_mandir}/manl/
+%dir %{_mandir}/man3/
 %{_libdir}/libblas.so.*
 
 %files -n blas-devel
@@ -204,6 +265,10 @@ ln -sf libblas.so.%{version} libblas.so.%{mediumver}
 %{_libdir}/libblas*.a
 
 %changelog
+* Mon Nov 28 2011 Tom Callaway <spot at fedoraproject.org> - 3.4.0-1
+- update to 3.4.0
+- build and include lapacke
+
 * Thu Jun 02 2011 Tom Callaway <spot at fedoraproject.org> - 3.3.1-1
 - update to 3.3.1
 - create /usr/share/man/manl/ as 0755 and own it in lapack and blas (bz634369)
diff --git a/sources b/sources
index 2dcfeb2..1971d9d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d0d533ec9a5b74933c2a1e84eedc58b4  lapack-3.3.1.tgz
-0f88dbcf41bb53ef98890ee834da913e  manpages.tgz
+02d5706ec03ba885fc246e5fa10d8c70  lapack-3.4.0.tgz
+b9448c036dcfb174215ecbd207168fad  manpages.tgz


More information about the scm-commits mailing list