dist-git conversion

- Remove static libraries.
- Fix typo in SSE3 subpackage's summary.

.gitignore

@@ -1,3 +1,5 @@
 atlas3.8.3.tar.bz2
 PPRO32.tgz
 K7323DNow.tgz
+USII32.tgz
+USII64.tgz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: atlas
-# $Id$
-NAME := atlas
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

README.Fedora

@@ -38,10 +38,14 @@ lapack libraries that should work as a drop-in replacement for the
 standard ones (they are installed in /usr/lib{64}/atlas* rather than
 /usr/lib{64}).
 
-For i386 systems, 3 ATLAS subpackages are built for SSE1, SSE2, and SSE3 ix86
-extensions, using architectural defaults obtained from PIII, Pentium 4 with
-SSE2 extension and PENTIUM 4 with SSE3 extensions respectively.
+For i386 systems, 4 ATLAS subpackages are built for 3Dnow, SSE1, SSE2, and SSE3
+ix86 extensions, using architectural defaults obtained from Athlon K7, PIII, Pentium 4 with SSE2 extension and PENTIUM 4 with SSE3 extensions respectively.
 
+This packaging allows multiple installation of different atlas sub-packages
+at the same time. The alternatives system (read 'man alternatives' for usage)
+is used in the -devel subpackages to select the appropriate location for the 
+architectural dependent header files.
+ 
 This package is designed to build RPMs that are identical regardless
 of where they are compiled and that provide reasonable performance on
 a wide range of hardware. For users who want optimal performance on
@@ -49,7 +53,7 @@ particular hardware, custom RPMs can be built from the source package
 by setting the RPM macro "enable_native_atlas" to a value of 1. This
 can be done from the command line as in the following example:
 
-rpmbuild -D "enable_native_atlas 1" --rebuild atlas-3.8.2-1.src.rpm
+rpmbuild -D "enable_native_atlas 1" --rebuild atlas-3.8.3-1.src.rpm
 
 This will cause the ATLAS build to use the achitectural default most
 appropriate for the system on which the package is to be built.

atlas-sparc-linux.patch

@@ -0,0 +1,95 @@
+diff -uNr ATLAS.orig/CONFIG/src/backend/archinfo_linux.c ATLAS/CONFIG/src/backend/archinfo_linux.c
+--- ATLAS.orig/CONFIG/src/backend/archinfo_linux.c	2010-02-01 23:28:58.000000000 +0000
++++ ATLAS/CONFIG/src/backend/archinfo_linux.c	2010-02-02 22:38:31.000000000 +0000
+@@ -145,14 +145,12 @@
+  *    Add these back if we get machine access and can test
+  */
+    case AFSPARC:  /* don't know here anymore */
+-      #if 0
+       if ( !CmndOneLine(NULL, "fgrep cpu /proc/cpuinfo", res) )
+       {
+-         if (strstr(res, "UltraSparc II")) mach = SunUS2;
+-         else if (strstr(res, "UltraSparc I")) mach = SunUS1;
+-         else if (strstr(res, "UltraSparc")) mach = SunUSX;
++         if (strstr(res, "UltraSparc II")) mach = SunUSII;
++         else if (strstr(res, "UltraSparc I")) mach = SunUSI;
++         else if (strstr(res, "UltraSparc")) mach = SunUSII;
+       }
+-      #endif
+       break;
+    case AFALPHA:
+       #if 0
+@@ -196,6 +194,11 @@
+       reslns = CmndResults(NULL, "grep '^processor' /proc/cpuinfo");
+       if (reslns) ncpu = fNumLines(reslns);
+    }
++   if (__sparc__) 
++   {
++      reslns = CmndResults(NULL, "grep '^CPU.*online' /proc/cpuinfo"); 
++      if (reslns) ncpu = fNumLines(reslns);
++   }
+    return(ncpu);
+ }
+ 
+diff -uNr ATLAS.orig/tune/blas/gemm/CASES/ATL_dmm4x4x2_US.c ATLAS/tune/blas/gemm/CASES/ATL_dmm4x4x2_US.c
+--- ATLAS.orig/tune/blas/gemm/CASES/ATL_dmm4x4x2_US.c	2010-02-01 23:29:23.000000000 +0000
++++ ATLAS/tune/blas/gemm/CASES/ATL_dmm4x4x2_US.c	2010-02-01 23:30:07.000000000 +0000
+@@ -95,6 +95,11 @@
+ #define incBm   %g3
+ #define incBn   %g4
+ 
++#if defined(__sparc__) && defined(__arch64__)
++        .register               %g2, #scratch
++        .register               %g3, #scratch
++#endif
++
+ #ifdef DCPLX
+    #define incCm 64
+    #define CSH 4
+diff -uNr ATLAS.orig/tune/blas/gemm/CASES/ATL_dmm4x4x8_US.c ATLAS/tune/blas/gemm/CASES/ATL_dmm4x4x8_US.c
+--- ATLAS.orig/tune/blas/gemm/CASES/ATL_dmm4x4x8_US.c	2010-02-01 23:29:24.000000000 +0000
++++ ATLAS/tune/blas/gemm/CASES/ATL_dmm4x4x8_US.c	2010-02-01 23:30:08.000000000 +0000
+@@ -135,6 +135,11 @@
+    #define pfB	%i2  /* aliased with ldab */
+ #endif
+ 
++#if defined(__sparc__) && defined(__arch64__) 
++        .register               %g2, #scratch
++        .register               %g3, #scratch
++#endif
++
+ #ifdef DCPLX
+    #define CMUL(arg_) ((arg_)*2)
+    #define incCm 64
+diff -uNr ATLAS.orig/tune/blas/gemm/CASES/ATL_smm4x4x2_US.c ATLAS/tune/blas/gemm/CASES/ATL_smm4x4x2_US.c
+--- ATLAS.orig/tune/blas/gemm/CASES/ATL_smm4x4x2_US.c	2010-02-01 23:29:25.000000000 +0000
++++ ATLAS/tune/blas/gemm/CASES/ATL_smm4x4x2_US.c	2010-02-01 23:30:09.000000000 +0000
+@@ -93,6 +93,12 @@
+ #define rC23	%f30
+ #define rC33	%f31
+ #define FSIZE	64
++
++#if defined(__sparc__) && defined(__arch64__)
++        .register               %g2, #scratch
++        .register               %g3, #scratch
++#endif
++
+ #ifdef SCPLX
+    #define CSH 3
+    #define CMUL(arg_) ((arg_)*2)
+diff -uNr ATLAS.orig/tune/blas/gemm/CASES/ATL_smm4x4x72_US.c ATLAS/tune/blas/gemm/CASES/ATL_smm4x4x72_US.c
+--- ATLAS.orig/tune/blas/gemm/CASES/ATL_smm4x4x72_US.c	2010-02-01 23:29:25.000000000 +0000
++++ ATLAS/tune/blas/gemm/CASES/ATL_smm4x4x72_US.c	2010-02-01 23:30:09.000000000 +0000
+@@ -108,6 +108,12 @@
+ #define rC23	%f30
+ #define rC33	%f31
+ #define FSIZE	64
++
++#if defined(__sparc__) && defined(__arch64__)
++        .register               %g2, #scratch
++        .register               %g3, #scratch
++#endif
++
+ #ifdef SCPLX
+    #define CSH 3
+    #define CMUL(arg_) ((arg_)*2)

atlas.spec

@@ -2,7 +2,7 @@
 
 Name:           atlas
 Version:        3.8.3
-Release:        10%{?dist}
+Release:        14%{?dist}
 Summary:        Automatically Tuned Linear Algebra Software
 
 Group:          System Environment/Libraries
@@ -12,10 +12,13 @@ Source0:        http://downloads.sourceforge.net/math-atlas/%{name}%{version}.ta
 Source1:        PPRO32.tgz
 Source2:        K7323DNow.tgz
 Source3:        README.Fedora
+Source4:        USII64.tgz
+Source5:        USII32.tgz
 Patch0:		atlas-fedora_shared.patch
+Patch1:         atlas-sparc-linux.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gcc-gfortran lapack-devel
+BuildRequires:  gcc-gfortran lapack-static
 
 %description
 The ATLAS (Automatically Tuned Linear Algebra Software) project is an
@@ -37,10 +40,12 @@ see the documentation for information.
 Summary:        Development libraries for ATLAS
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
+Requires(posttrans):	chkconfig
+Requires(preun):	chkconfig
 
 %description devel
-This package contains the static libraries and headers for development
+This package contains the libraries and headers for development
 with ATLAS (Automatically Tuned Linear Algebra Software).
 
 %define types base
@@ -48,6 +53,34 @@ with ATLAS (Automatically Tuned Linear Algebra Software).
 %if "%{?enable_native_atlas}" == "0"
 ############## Subpackages for architecture extensions #################
 #
+%ifarch x86_64
+%define types base sse2
+
+%package sse2
+Summary:        ATLAS libraries for SSE2 extensions
+Group:          System Environment/Libraries
+
+%description sse2
+This package contains the ATLAS (Automatically Tuned Linear Algebra
+Software) libraries compiled with optimizations for the SSE2
+extensions to the x86_64 architecture. The base ATLAS builds in Fedora for the
+x86_64 architecture are made fro the SSE3 extensions.
+
+%package sse2-devel
+Summary:        Development libraries for ATLAS with SSE2 extensions
+Group:          Development/Libraries
+Requires:       %{name}-sse2 = %{version}-%{release}
+Obsoletes:	%name-header <= %version-%release
+Requires(posttans):	chkconfig
+Requires(preun):	chkconfig
+
+%description sse2-devel
+This package contains shared and static versions of the ATLAS
+(Automatically Tuned Linear Algebra Software) libraries compiled with
+optimizations for the SSE2 extensions to the x86_64 architecture.
+
+%endif
+
 %ifarch %{ix86}
 %define types base 3dnow sse sse2 sse3
 
@@ -65,10 +98,12 @@ and SSE3 extensions.
 Summary:        Development libraries for ATLAS with 3DNow extensions
 Group:          Development/Libraries
 Requires:       %{name}-3dnow = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
+Requires(posttrans):	chkconfig
+Requires(preun):	chkconfig
 
 %description 3dnow-devel
-This package contains headers and shared and static versions of the ATLAS
+This package contains headers and shared versions of the ATLAS
 (Automatically Tuned Linear Algebra Software) libraries compiled with
 optimizations for the 3DNow extensions to the ix86 architecture.
 
@@ -86,10 +121,12 @@ extensions.
 Summary:        Development libraries for ATLAS with SSE extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
+Requires(posttrans):	chkconfig
+Requires(preun):	chkconfig
 
 %description sse-devel
-This package contains headers and shared and static versions of the ATLAS
+This package contains headers and shared versions of the ATLAS
 (Automatically Tuned Linear Algebra Software) libraries compiled with
 optimizations for the SSE(1) extensions to the ix86 architecture.
 
@@ -98,8 +135,8 @@ Summary:        ATLAS libraries for SSE2 extensions
 Group:          System Environment/Libraries
 
 %description sse2
-This package contains the ATLAS (Automatically Tuned Linear Algebra
-Software) libraries compiled with optimizations for the SSE2
+This package contains ATLAS (Automatically Tuned Linear Algebra Software)
+shared libraries compiled with optimizations for the SSE2
 extensions to the ix86 architecture. Fedora also produces ATLAS build with
 SSE(1) and SSE3 extensions.
 
@@ -107,15 +144,17 @@ SSE(1) and SSE3 extensions.
 Summary:        Development libraries for ATLAS with SSE2 extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse2 = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
+Requires(posttrans):	chkconfig
+Requires(preun):	chkconfig
 
 %description sse2-devel
-This package contains shared and static versions of the ATLAS
-(Automatically Tuned Linear Algebra Software) libraries compiled with
-optimizations for the SSE2 extensions to the ix86 architecture.
+This package contains ATLAS (Automatically Tuned Linear Algebra Software)
+shared libraries compiled with optimizations for the SSE2 extensions to the
+ix86 architecture.
 
 %package sse3
-Summary:        ATLAS libraries for 3DNow extensions
+Summary:        ATLAS libraries for SSE3 extensions
 Group:          System Environment/Libraries
 
 %description sse3
@@ -124,46 +163,55 @@ Software) libraries compiled with optimizations for the SSE3.
 Fedora also produces ATLAS build with SSE(1) and SSE2 extensions.
 
 %package sse3-devel
-Summary:        Development libraries for ATLAS with 3DNow extensions
+Summary:        Development libraries for ATLAS with SSE3 extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse3 = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
+Requires(posttrans):	chkconfig
+Requires(preun):	chkconfig
 
 %description sse3-devel
-This package contains shared and static versions of the ATLAS
-(Automatically Tuned Linear Algebra Software) libraries compiled with
-optimizations for the sse3 extensions to the ix86 architecture.
+This package contains ATLAS (Automatically Tuned Linear Algebra Software)
+shared libraries compiled with optimizations for the SSE3 extensions to the ix86 architecture.
 
 %endif
 %endif
 
-%ifarch x86_64 ppc64 s390x
-%define mode 64
-%else
-%define mode 32
-%endif
-
 %prep
 %setup -q -n ATLAS
 %patch0 -p0 -b .shared
+#%patch1 -p1 -b .sparc
 cp %{SOURCE1} CONFIG/ARCHS/
 cp %{SOURCE2} CONFIG/ARCHS/
 cp %{SOURCE3} doc
+cp %{SOURCE4} CONFIG/ARCHS/
+cp %{SOURCE5} CONFIG/ARCHS/
 
 %build
 for type in %{types}; do
 	if [ "$type" = "base" ]; then
 		libname=atlas
+		%define pr_base %(echo $((%{__isa_bits}+0)))
 	else
 		libname=atlas-${type}
 	fi
 	mkdir -p %{_arch}_${type}
 	pushd %{_arch}_${type}
-	../configure -b %{mode} -D c -DWALL -Fa alg '-g -Wa,--noexecstack -fPIC'\
+	../configure -b %{__isa_bits} -D c -DWALL -Fa alg '-g -Wa,--noexecstack -fPIC'\
 	--prefix=%{buildroot}%{_prefix}			\
 	--incdir=%{buildroot}%{_includedir}		\
 	--libdir=%{buildroot}%{_libdir}/${libname}	\
-	--with-netlib-lapack=%{_libdir}/liblapack_pic.a
+	--with-netlib-lapack=%{_libdir}/liblapack_pic.a	\
+	-Si cputhrchk 0
+
+%ifarch x86_64
+	if [ "$type" = "sse2" ]; then
+		sed -i 's#ARCH =.*#ARCH = HAMMER64SSE2#' Make.inc
+		sed -i 's#-DATL_SSE3##' Make.inc 
+		sed -i 's#-msse3#-msse2#' Make.inc 
+		%define pr_sse2 %(echo $((%{__isa_bits}-1)))
+	fi
+%endif
 
 %ifarch %{ix86}
 	if [ "$type" = "base" ]; then
@@ -174,16 +222,20 @@ for type in %{types}; do
 		sed -i 's#ARCH =.*#ARCH = K7323DNow#' Make.inc
 		sed -i 's#-DATL_SSE3 -DATL_SSE2 -DATL_SSE1##' Make.inc 
 		sed -i 's#-mfpmath=sse -msse3#-mfpmath=387#' Make.inc 
+		%define pr_3dnow %(echo $((%{__isa_bits}+1)))
 	elif [ "$type" = "sse" ]; then
 		sed -i 's#ARCH =.*#ARCH = PIII32SSE1#' Make.inc
 		sed -i 's#-DATL_SSE3 -DATL_SSE2##' Make.inc 
 		sed -i 's#-msse3#-msse#' Make.inc 
+		%define pr_sse %(echo $((%{__isa_bits}+2)))
 	elif [ "$type" = "sse2" ]; then
 		sed -i 's#ARCH =.*#ARCH = P432SSE2#' Make.inc
 		sed -i 's#-DATL_SSE3##' Make.inc 
 		sed -i 's#-msse3#-msse2#' Make.inc 
+		%define pr_sse2 %(echo $((%{__isa_bits}+3)))
 	elif [ "$type" = "sse3" ]; then
 		sed -i 's#ARCH =.*#ARCH = P4E32SSE3#' Make.inc
+		%define pr_sse3 %(echo $((%{__isa_bits}+4)))
 	fi
 %endif
 	make build
@@ -198,10 +250,13 @@ rm -rf %{buildroot}
 for type in %{types}; do
 	pushd %{_arch}_${type}
 	make DESTDIR=%{buildroot} install
+        mv %{buildroot}%{_includedir}/atlas %{buildroot}%{_includedir}/atlas-%{_arch}-${type}
 	if [ "$type" = "base" ]; then
 		cp -pr lib/*.so* %{buildroot}%{_libdir}/atlas/
+		rm -f %{buildroot}%{_libdir}/atlas/*.a
 	else
 		cp -pr lib/*.so* %{buildroot}%{_libdir}/atlas-${type}/
+		rm -f %{buildroot}%{_libdir}/atlas-${type}/*.a
 	fi
 	popd
 
@@ -211,9 +266,11 @@ for type in %{types}; do
 		> %{buildroot}/etc/ld.so.conf.d/atlas-%{_arch}.conf
 	else
 		echo "%{_libdir}/atlas-${type}"	\
-		> %{buildroot}/etc/ld.so.conf.d/atlas-${type}.conf
+		> %{buildroot}/etc/ld.so.conf.d/atlas-%{_arch}-${type}.conf
 	fi
 done
+mkdir -p %{buildroot}%{_includedir}/atlas
+
 
 %clean
 rm -rf %{buildroot}
@@ -222,24 +279,99 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-%ifarch %{ix86} && %if "%{?enable_native_atlas}" == "0"
+%posttrans devel
+if [ $1 -eq 0 ] ; then
+/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+		%{_includedir}/atlas-%{_arch}-base %{pr_base}
+fi
 
-%post -n atlas-3dnow -p /sbin/ldconfig
+%preun devel
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-base
+fi
 
-%postun -n atlas-3dnow -p /sbin/ldconfig
-
-%post -n atlas-sse -p /sbin/ldconfig
-
-%postun -n atlas-sse -p /sbin/ldconfig
+%if "%{?enable_native_atlas}" == "0"
+%ifarch x86_64
 
 %post -n atlas-sse2 -p /sbin/ldconfig
 
 %postun -n atlas-sse2 -p /sbin/ldconfig
 
+%posttrans sse2-devel
+if [ $1 -eq 0 ] ; then
+/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+		%{_includedir}/atlas-%{_arch}-sse2  %{pr_sse2}
+fi
+
+%preun sse2-devel
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-sse2
+fi
+
+%endif
+
+%ifarch %{ix86}
+%post -n atlas-3dnow -p /sbin/ldconfig
+
+%postun -n atlas-3dnow -p /sbin/ldconfig
+
+%posttrans 3dnow-devel
+if [ $1 -eq 0 ] ; then
+/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+		%{_includedir}/atlas-%{_arch}-3dnow  %{pr_3dnow}
+fi
+
+%preun 3dnow-devel
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-3dnow
+fi
+
+%post -n atlas-sse -p /sbin/ldconfig
+
+%postun -n atlas-sse -p /sbin/ldconfig
+
+%posttrans sse-devel
+if [ $1 -eq 0 ] ; then
+/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+		%{_includedir}/atlas-%{_arch}-sse  %{pr_sse}
+fi
+
+%preun sse-devel
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-sse
+fi
+
+%post -n atlas-sse2 -p /sbin/ldconfig
+
+%postun -n atlas-sse2 -p /sbin/ldconfig
+
+%posttrans sse2-devel
+if [ $1 -eq 0 ] ; then
+/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+		%{_includedir}/atlas-%{_arch}-sse2  %{pr_sse2}
+fi
+
+%preun sse2-devel
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-sse2
+fi
+
 %post -n atlas-sse3 -p /sbin/ldconfig
 
 %postun -n atlas-sse3 -p /sbin/ldconfig
 
+%posttrans sse3-devel
+if [ $1 -eq 0 ] ; then
+/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+		%{_includedir}/atlas-%{_arch}-sse3  %{pr_sse3}
+fi
+
+%preun sse3-devel
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-sse3
+fi
+
+%endif
 %endif
 
 %files
@@ -253,75 +385,111 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc doc
 %{_libdir}/atlas/*.so
-%{_libdir}/atlas/*.a
-%{_includedir}/atlas
+%{_includedir}/atlas-%{_arch}-base/
 %{_includedir}/*.h
+%ghost %{_includedir}/atlas
 
-%ifarch %{ix86} && %if "%{?enable_native_atlas}" == "0"
+%if "%{?enable_native_atlas}" == "0"
 
-%files 3dnow
-%defattr(-,root,root,-)
-%doc doc/README.Fedora
-%dir %{_libdir}/atlas-3dnow
-%{_libdir}/atlas-3dnow/*.so.*
-%config(noreplace) /etc/ld.so.conf.d/atlas-3dnow.conf
-
-%files 3dnow-devel
-%defattr(-,root,root,-)
-%doc doc
-%{_libdir}/atlas-3dnow/*.so
-%{_libdir}/atlas-3dnow/*.a
-%{_includedir}/atlas
-%{_includedir}/*.h
-
-%files sse
-%defattr(-,root,root,-)
-%doc doc/README.Fedora
-%dir %{_libdir}/atlas-sse
-%{_libdir}/atlas-sse/*.so.*
-%config(noreplace) /etc/ld.so.conf.d/atlas-sse.conf
-
-%files sse-devel
-%defattr(-,root,root,-)
-%doc doc
-%{_libdir}/atlas-sse/*.so
-%{_libdir}/atlas-sse/*.a
-%{_includedir}/atlas
-%{_includedir}/*.h
+%ifarch x86_64
 
 %files sse2
 %defattr(-,root,root,-)
 %doc doc/README.Fedora
 %dir %{_libdir}/atlas-sse2
 %{_libdir}/atlas-sse2/*.so.*
-%config(noreplace) /etc/ld.so.conf.d/atlas-sse2.conf
+%config(noreplace) /etc/ld.so.conf.d/atlas-%{_arch}-sse2.conf
 
 %files sse2-devel
 %defattr(-,root,root,-)
 %doc doc
 %{_libdir}/atlas-sse2/*.so
-%{_libdir}/atlas-sse2/*.a
-%{_includedir}/atlas
+%{_includedir}/atlas-%{_arch}-sse2/
 %{_includedir}/*.h
+%ghost %{_includedir}/atlas
+
+%endif
+
+%ifarch %{ix86}
+
+%files 3dnow
+%defattr(-,root,root,-)
+%doc doc/README.Fedora
+%dir %{_libdir}/atlas-3dnow
+%{_libdir}/atlas-3dnow/*.so.*
+%config(noreplace) /etc/ld.so.conf.d/atlas-%{_arch}-3dnow.conf
+
+%files 3dnow-devel
+%defattr(-,root,root,-)
+%doc doc
+%{_libdir}/atlas-3dnow/*.so
+%{_includedir}/atlas-%{_arch}-3dnow/
+%{_includedir}/*.h
+%ghost %{_includedir}/atlas
+
+%files sse
+%defattr(-,root,root,-)
+%doc doc/README.Fedora
+%dir %{_libdir}/atlas-sse
+%{_libdir}/atlas-sse/*.so.*
+%config(noreplace) /etc/ld.so.conf.d/atlas-%{_arch}-sse.conf
+
+%files sse-devel
+%defattr(-,root,root,-)
+%doc doc
+%{_libdir}/atlas-sse/*.so
+%{_includedir}/atlas-%{_arch}-sse/
+%{_includedir}/*.h
+%ghost %{_includedir}/atlas
+
+%files sse2
+%defattr(-,root,root,-)
+%doc doc/README.Fedora
+%dir %{_libdir}/atlas-sse2
+%{_libdir}/atlas-sse2/*.so.*
+%config(noreplace) /etc/ld.so.conf.d/atlas-%{_arch}-sse2.conf
+
+%files sse2-devel
+%defattr(-,root,root,-)
+%doc doc
+%{_libdir}/atlas-sse2/*.so
+%{_includedir}/atlas-%{_arch}-sse2/
+%{_includedir}/*.h
+%ghost %{_includedir}/atlas
 
 %files sse3
 %defattr(-,root,root,-)
 %doc doc/README.Fedora
 %dir %{_libdir}/atlas-sse3
 %{_libdir}/atlas-sse3/*.so.*
-%config(noreplace) /etc/ld.so.conf.d/atlas-sse3.conf
+%config(noreplace) /etc/ld.so.conf.d/atlas-%{_arch}-sse3.conf
 
 %files sse3-devel
 %defattr(-,root,root,-)
 %doc doc
 %{_libdir}/atlas-sse3/*.so
-%{_libdir}/atlas-sse3/*.a
-%{_includedir}/atlas
+%{_includedir}/atlas-%{_arch}-sse3/
 %{_includedir}/*.h
+%ghost %{_includedir}/atlas
 
+%endif
 %endif
 
 %changelog
+* Tue Jul 27 2010 Deji Akingunola <dakingun@gmail.com> - 3.8.3-14
+- Create a subpackage for SSE2 on x86_64
+- Remove static libraries.
+- Fix typo in SSE3 subpackage's summary.
+
+* Tue Feb 02 2010 Dennis Gilmore <dennis@ausil.us> - 3.8.3-13
+- fix sparc to build 
+
+* Sat Oct 24 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-12
+- Use alternatives to workaround multilib conflicts (BZ#508565). 
+
+* Tue Sep 29 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-11
+- Obsolete the -header subpackage properly. 
+
 * Sat Sep 26 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-10
 - Use the new arch. default for Pentium PRO (Fedora bug #510498)
 - (Re-)Introduce 3dNow subpackage

sources

@@ -1,3 +1,5 @@
 6c13be94a87178e7582111c08e9503bc  atlas3.8.3.tar.bz2
 676548252837b1e458181111443f340f  PPRO32.tgz
 3f174cdcb4c964843f27dbfc4ad4b1c8  K7323DNow.tgz
+ebb4732aff468bbc223e7f734252173b  USII32.tgz
+31f8ae7583d290e5414a1a61ff6e7e39  USII64.tgz