dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-atlas3.8.3.tar.bz2

.gitignore

@@ -0,0 +1,3 @@
+atlas3.8.3.tar.bz2
+PPRO32.tgz
+K7323DNow.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)

atlas.spec

@@ -2,14 +2,16 @@
 
 Name:           atlas
 Version:        3.8.3
-Release:        3%{?dist}
+Release:        9%{?dist}
 Summary:        Automatically Tuned Linear Algebra Software
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://math-atlas.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/math-atlas/%{name}%{version}.tar.bz2
-Source1:        README.Fedora
+Source1:        PPRO32.tgz
+Source2:        K7323DNow.tgz
+Source3:        README.Fedora
 Patch0:		atlas-fedora_shared.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -35,6 +37,7 @@ see the documentation for information.
 Summary:        Development libraries for ATLAS
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Obsoletes:	%name-header <= %version-%release
 
 %description devel
 This package contains the static libraries and headers for development
@@ -45,17 +48,33 @@ with ATLAS (Automatically Tuned Linear Algebra Software).
 %if "%{?enable_native_atlas}" == "0"
 ############## Subpackages for architecture extensions #################
 #
-# Because a set of ATLAS libraries is a ~5 MB package, separate packages
-# are created for SSE, SSE2, and SSE3 extensions to ix86.
+%ifarch %{ix86}
+%define types base 3dnow sse sse2 sse3
 
-%ifarch i586
-%define types sse sse2 sse3
+%package 3dnow
+Summary:        ATLAS libraries for 3DNow extensions
+Group:          System Environment/Libraries
+
+%description 3dnow
+This package contains the ATLAS (Automatically Tuned Linear Algebra
+Software) libraries compiled with optimizations for the 3DNow extension
+to the ix86 architecture. Fedora also produces ATLAS build with SSE, SSE2
+and SSE3 extensions.
+
+%package 3dnow-devel
+Summary:        Development libraries for ATLAS with 3DNow extensions
+Group:          Development/Libraries
+Requires:       %{name}-3dnow = %{version}-%{release}
+Obsoletes:	%name-header <= %version-%release
+
+%description 3dnow-devel
+This package contains headers and shared and static versions of the ATLAS
+(Automatically Tuned Linear Algebra Software) libraries compiled with
+optimizations for the 3DNow extensions to the ix86 architecture.
 
 %package sse
 Summary:        ATLAS libraries for SSE extensions
 Group:          System Environment/Libraries
-Obsoletes:	%{name}-3dnow < 3.7
-Provides:	%{name}-3dnow = %{version}-%{release}
 
 %description sse
 This package contains the ATLAS (Automatically Tuned Linear Algebra
@@ -67,19 +86,16 @@ extensions.
 Summary:        Development libraries for ATLAS with SSE extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse = %{version}-%{release}
-Obsoletes:	%{name}-3dnow-devel < 3.7
-Provides:	%{name}-3dnow-devel = %{version}-%{release}
+Obsoletes:	%name-header <= %version-%release
 
 %description sse-devel
-This package contains headers and static versions of the ATLAS
+This package contains headers and shared and static versions of the ATLAS
 (Automatically Tuned Linear Algebra Software) libraries compiled with
 optimizations for the SSE(1) extensions to the ix86 architecture.
 
 %package sse2
 Summary:        ATLAS libraries for SSE2 extensions
 Group:          System Environment/Libraries
-Obsoletes:	%{name} < 3.7
-Provides:	%{name} = %{version}-%{release}
 
 %description sse2
 This package contains the ATLAS (Automatically Tuned Linear Algebra
@@ -91,11 +107,10 @@ SSE(1) and SSE3 extensions.
 Summary:        Development libraries for ATLAS with SSE2 extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse2 = %{version}-%{release}
-Obsoletes:	%{name}-devel < 3.7
-Provides:	%{name}-devel = %{version}-%{release}
+Obsoletes:	%name-header <= %version-%release
 
 %description sse2-devel
-This package contains headers and static versions of the ATLAS
+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.
 
@@ -112,16 +127,17 @@ Fedora also produces ATLAS build with SSE(1) and SSE2 extensions.
 Summary:        Development libraries for ATLAS with 3DNow extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse3 = %{version}-%{release}
+Obsoletes:	%name-header <= %version-%release
 
 %description sse3-devel
-This package contains headers and static versions of the ATLAS
+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.
 
 %endif
 %endif
 
-%ifarch x86_64 ppc64
+%ifarch x86_64 ppc64 s390x
 %define mode 64
 %else
 %define mode 32
@@ -130,7 +146,9 @@ optimizations for the sse3 extensions to the ix86 architecture.
 %prep
 %setup -q -n ATLAS
 %patch0 -p0 -b .shared
-cp %{SOURCE1} doc
+cp %{SOURCE1} CONFIG/ARCHS/
+cp %{SOURCE2} CONFIG/ARCHS/
+cp %{SOURCE3} doc
 
 %build
 for type in %{types}; do
@@ -141,21 +159,33 @@ for type in %{types}; do
 	fi
 	mkdir -p %{_arch}_${type}
 	pushd %{_arch}_${type}
-	../configure -b %{mode} -D c -DWALL -Fa alg '-Wa,--noexecstack -fPIC'\
+	../configure -b %{mode} -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
 
-	if [ "$type" = "sse" ]; then
+%ifarch %{ix86}
+	if [ "$type" = "base" ]; then
+		sed -i 's#ARCH =.*#ARCH = PPRO32#' Make.inc
+		sed -i 's#-DATL_SSE3 -DATL_SSE2 -DATL_SSE1##' Make.inc 
+		sed -i 's#-mfpmath=sse -msse3#-mfpmath=387#' Make.inc 
+	elif [ "$type" = "3dnow" ]; then
+		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 
+	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 
 	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 
 	elif [ "$type" = "sse3" ]; then
 		sed -i 's#ARCH =.*#ARCH = P4E32SSE3#' Make.inc
 	fi
+%endif
 	make build
 	cd lib
 	make shared
@@ -184,20 +214,34 @@ for type in %{types}; do
 		> %{buildroot}/etc/ld.so.conf.d/atlas-${type}.conf
 	fi
 done
-%ifarch i586 && %if "%{?enable_native_atlas}" == "0"
-cp -pr %{buildroot}%{_libdir}/atlas-sse2 %{buildroot}%{_libdir}/atlas
-echo "%{_libdir}/atlas"	>> %{buildroot}/etc/ld.so.conf.d/atlas-sse2.conf
-%endif
 
 %clean
 rm -rf %{buildroot}
 
-%ifnarch i586 || %if "%{?enable_native_atlas}" == "1"
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+%ifarch %{ix86} && %if "%{?enable_native_atlas}" == "0"
+
+%post -n atlas-3dnow -p /sbin/ldconfig
+
+%postun -n atlas-3dnow -p /sbin/ldconfig
+
+%post -n atlas-sse -p /sbin/ldconfig
+
+%postun -n atlas-sse -p /sbin/ldconfig
+
+%post -n atlas-sse2 -p /sbin/ldconfig
+
+%postun -n atlas-sse2 -p /sbin/ldconfig
+
+%post -n atlas-sse3 -p /sbin/ldconfig
+
+%postun -n atlas-sse3 -p /sbin/ldconfig
+
+%endif
+
 %files
 %defattr(-,root,root,-)
 %doc doc/README.Fedora
@@ -213,19 +257,22 @@ rm -rf %{buildroot}
 %{_includedir}/atlas
 %{_includedir}/*.h
 
-%else
+%ifarch %{ix86} && %if "%{?enable_native_atlas}" == "0"
 
-%post -n atlas-sse -p /sbin/ldconfig
+%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
 
-%postun -n atlas-sse -p /sbin/ldconfig
-
-%post -n atlas-sse2 -p /sbin/ldconfig
-
-%postun -n atlas-sse2 -p /sbin/ldconfig
-
-%post -n atlas-sse3 -p /sbin/ldconfig
-
-%postun -n atlas-sse3 -p /sbin/ldconfig
+%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,-)
@@ -246,9 +293,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc doc/README.Fedora
 %dir %{_libdir}/atlas-sse2
-%dir %{_libdir}/atlas
 %{_libdir}/atlas-sse2/*.so.*
-%{_libdir}/atlas/*.so.*
 %config(noreplace) /etc/ld.so.conf.d/atlas-sse2.conf
 
 %files sse2-devel
@@ -256,8 +301,6 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-sse2/*.so
 %{_libdir}/atlas-sse2/*.a
-%{_libdir}/atlas/*.so
-%{_libdir}/atlas/*.a
 %{_includedir}/atlas
 %{_includedir}/*.h
 
@@ -279,6 +322,30 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Sep 29 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-9
+- Obsolete the -header subpackage properly. 
+
+* Sat Sep 26 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-8
+- Use the new arch. default for Pentium PRO (Fedora bug #510498)
+- (Re-)Introduce 3dNow subpackage
+- Revert the last change, it doesn't solve the problem. 
+
+* Tue Aug 04 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-7
+- Create a -header subpackage to avoid multilib conflicts (BZ#508565). 
+
+* Tue Aug 04 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-6
+- Add '-g' to build flag to allow proper genration of debuginfo subpackages (Fedora bug #509813)
+- Build for F12
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat May 02 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-4
+- Use the right -msse* option for the -sse* subpackages (Fedora bug #498715)
+
+* Tue Apr 21 2009 Karsten Hopp <karsten@redhat.com> 3.8.3-3.1
+- add s390x to 64 bit archs
+
 * Fri Feb 27 2009 Deji Akingunola <dakingun@gmail.com> - 3.8.3-3
 - Rebuild
 

sources

@@ -1 +1,3 @@
 6c13be94a87178e7582111c08e9503bc  atlas3.8.3.tar.bz2
+676548252837b1e458181111443f340f  PPRO32.tgz
+3f174cdcb4c964843f27dbfc4ad4b1c8  K7323DNow.tgz