Browse Source

atlas: added Japanese Summary

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6232 ec354946-7b23-47d6-9f5a-488ba84defc7
kenta 12 years ago
parent
commit
81c36f31f7
1 changed files with 40 additions and 188 deletions
  1. 40 188
      a/atlas/atlas-vl.spec

+ 40 - 188
a/atlas/atlas-vl.spec

@@ -1,12 +1,14 @@
 %define enable_native_atlas 0
+%define disable_CPU_throttling_probe 1
 
 Name:           atlas
 Version:        3.8.4
 %if "%{?enable_native_atlas}" != "0"
 %define dist .native
 %endif
-Release:        4%{?_dist_release}
+Release:        5%{?_dist_release}
 Summary:        Automatically Tuned Linear Algebra Software
+Summary(ja):    自動的にCPUに最適化する線形代数ソフトウェア
 
 Group:          System Environment/Libraries
 License:        BSD
@@ -17,13 +19,8 @@ Source2:        K7323DNow.tgz
 Source3:        README.Fedora
 Source4:        USII64.tgz                                              
 Source5:        USII32.tgz                                              
-Source6:        IBMz1032.tgz
-Source7:        IBMz1064.tgz
-Source8:        IBMz19632.tgz
-Source9:        IBMz19664.tgz
 Patch0:		atlas-fedora_shared.patch
-Patch1:         atlas-s390port.patch
-Patch2:		atlas-fedora-arm.patch
+Patch1:		atlas-fedora-arm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran lapack-static
@@ -46,13 +43,14 @@ see the documentation for information.
 
 %package devel
 Summary:        Development libraries for ATLAS
+Summary(ja):    ATLAS を使ったプログラム開発に必要なヘッダファイル/ライブラリ
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Obsoletes:	%name-header <= %version-%release
 Requires(posttrans):	chkconfig
 Requires(preun):	chkconfig
-Requires(post):		/usr/sbin/alternatives
-Requires(postun):	/usr/sbin/alternatives
+Requires(post):		/sbin/alternatives
+Requires(postun):	/sbin/alternatives
 
 %description devel
 This package contains the libraries and headers for development
@@ -68,6 +66,7 @@ with ATLAS (Automatically Tuned Linear Algebra Software).
 
 %package sse3
 Summary:        ATLAS libraries for SSE3 extensions
+Summary(ja):    SSE3命令セット拡張に最適化した ATLASライブラリ
 Group:          System Environment/Libraries
 
 %description sse3
@@ -78,13 +77,14 @@ x86_64 architecture are made for the SSE2 extensions.
 
 %package sse3-devel
 Summary:        Development libraries for ATLAS with SSE3 extensions
+Summary(ja):    ATLAS を使ったプログラム開発に必要な SSE3命令セット拡張に最適化したヘッダファイル/ライブラリ
 Group:          Development/Libraries
 Requires:       %{name}-sse3 = %{version}-%{release}
 Obsoletes:	%name-header <= %version-%release
 Requires(posttrans):	chkconfig
 Requires(preun):	chkconfig
-Requires(post):		/usr/sbin/alternatives
-Requires(postun):	/usr/sbin/alternatives
+Requires(post):		/sbin/alternatives
+Requires(postun):	/sbin/alternatives
 
 %description sse3-devel
 This package contains shared and static versions of the ATLAS
@@ -98,6 +98,7 @@ optimizations for the SSE3 extensions to the x86_64 architecture.
 
 %package 3dnow
 Summary:        ATLAS libraries for 3DNow extensions
+Summary(ja):    3DNow命令セット拡張に最適化した ATLASライブラリ
 Group:          System Environment/Libraries
 
 %description 3dnow
@@ -108,6 +109,7 @@ and SSE3 extensions.
 
 %package 3dnow-devel
 Summary:        Development libraries for ATLAS with 3DNow extensions
+Summary(ja):    ATLAS を使ったプログラム開発に必要な 3DNow命令セット拡張に最適化したヘッダファイル/ライブラリ
 Group:          Development/Libraries
 Requires:       %{name}-3dnow = %{version}-%{release}
 Obsoletes:	%name-header <= %version-%release
@@ -121,6 +123,7 @@ optimizations for the 3DNow extensions to the ix86 architecture.
 
 %package sse
 Summary:        ATLAS libraries for SSE extensions
+Summary(ja):    SSE命令セット拡張に最適化した ATLASライブラリ
 Group:          System Environment/Libraries
 
 %description sse
@@ -131,6 +134,7 @@ extensions.
 
 %package sse-devel
 Summary:        Development libraries for ATLAS with SSE extensions
+Summary(ja):    ATLAS を使ったプログラム開発に必要な SSE命令セット拡張に最適化したヘッダファイル/ライブラリ
 Group:          Development/Libraries
 Requires:       %{name}-sse = %{version}-%{release}
 Obsoletes:	%name-header <= %version-%release
@@ -144,6 +148,7 @@ optimizations for the SSE(1) extensions to the ix86 architecture.
 
 %package sse2
 Summary:        ATLAS libraries for SSE2 extensions
+Summary(ja):    SSE2命令セット拡張に最適化した ATLASライブラリ
 Group:          System Environment/Libraries
 
 %description sse2
@@ -154,6 +159,7 @@ SSE(1) and SSE3 extensions.
 
 %package sse2-devel
 Summary:        Development libraries for ATLAS with SSE2 extensions
+Summary(ja):    ATLAS を使ったプログラム開発に必要な SSE2命令セット拡張に最適化したヘッダファイル/ライブラリ
 Group:          Development/Libraries
 Requires:       %{name}-sse2 = %{version}-%{release}
 Obsoletes:	%name-header <= %version-%release
@@ -167,6 +173,7 @@ ix86 architecture.
 
 %package sse3
 Summary:        ATLAS libraries for SSE3 extensions
+Summary(ja):    SSE3命令セット拡張に最適化した ATLASライブラリ
 Group:          System Environment/Libraries
 
 %description sse3
@@ -176,6 +183,7 @@ Fedora also produces ATLAS build with SSE(1) and SSE2 extensions.
 
 %package sse3-devel
 Summary:        Development libraries for ATLAS with SSE3 extensions
+Summary(ja):    ATLAS を使ったプログラム開発に必要な SSE3命令セット拡張に最適化したヘッダファイル/ライブラリ
 Group:          Development/Libraries
 Requires:       %{name}-sse3 = %{version}-%{release}
 Obsoletes:	%name-header <= %version-%release
@@ -188,52 +196,6 @@ shared libraries compiled with optimizations for the SSE3 extensions to the ix86
 
 %endif
 
-%ifarch s390 s390x
-%define types base z10 z196
-
-%package z196
-Summary:        ATLAS libraries for z196
-Group:          System Environment/Libraries
-
-%description z196
-This package contains the ATLAS (Automatically Tuned Linear Algebra
-Software) libraries compiled with optimizations for the z196.
-
-%package z196-devel
-Summary:        Development libraries for ATLAS for z196
-Group:          Development/Libraries
-Requires:       %{name}-z196 = %{version}-%{release}
-Obsoletes:	%name-header <= %version-%release
-Requires(posttrans):	chkconfig
-Requires(preun):	chkconfig
-
-%description z196-devel
-This package contains headers and shared versions of the ATLAS
-(Automatically Tuned Linear Algebra Software) libraries compiled with
-optimizations for the z196 architecture.
-
-%package z10
-Summary:        ATLAS libraries for z10
-Group:          System Environment/Libraries
-
-%description z10
-This package contains the ATLAS (Automatically Tuned Linear Algebra
-Software) libraries compiled with optimizations for the z10.
-
-%package z10-devel
-Summary:        Development libraries for ATLAS for z10
-Group:          Development/Libraries
-Requires:       %{name}-z10 = %{version}-%{release}
-Obsoletes:	%name-header <= %version-%release
-Requires(posttrans):	chkconfig
-Requires(preun):	chkconfig
-
-%description z10-devel
-This package contains headers and shared versions of the ATLAS
-(Automatically Tuned Linear Algebra Software) libraries compiled with
-optimizations for the z10 architecture.
-
-%endif
 %endif
 
 %global mode %{__isa_bits}
@@ -246,21 +208,14 @@ optimizations for the z10 architecture.
 %prep
 %setup -q -n ATLAS
 %patch0 -p0 -b .shared
-%ifarch s390 s390x
-%patch1 -p1 -b .s390
-%endif
 %ifarch %{arm}
-%patch2 -p0 -b .arm
+%patch1 -p0 -b .arm
 %endif
 cp %{SOURCE1} CONFIG/ARCHS/
 cp %{SOURCE2} CONFIG/ARCHS/
 cp %{SOURCE3} doc
 cp %{SOURCE4} CONFIG/ARCHS/
 cp %{SOURCE5} CONFIG/ARCHS/
-cp %{SOURCE6} CONFIG/ARCHS/
-cp %{SOURCE7} CONFIG/ARCHS/
-cp %{SOURCE8} CONFIG/ARCHS/
-cp %{SOURCE9} CONFIG/ARCHS/
 
 %build
 for type in %{types}; do
@@ -276,7 +231,10 @@ for type in %{types}; do
 	--prefix=%{buildroot}%{_prefix}			\
 	--incdir=%{buildroot}%{_includedir}		\
 	--libdir=%{buildroot}%{_libdir}/${libname}	\
-	--with-netlib-lapack=%{_libdir}/liblapack_pic.a
+	--with-netlib-lapack=%{_libdir}/liblapack_pic.a	\
+%if %{disable_CPU_throttling_probe}
+	-Si cputhrchk 0
+%endif
 
 %if "%{?enable_native_atlas}" == "0"
 %ifarch x86_64
@@ -316,52 +274,6 @@ for type in %{types}; do
 	fi
 %endif
 
-%ifarch s390 s390x
-# we require a z9/z10/z196 but base,z10 and z196
-# we also need a compiler with -march=z196 support
-# the base support will use z196 tuning
-	if [ "$type" = "base" ]; then
-		%ifarch s390x 
-			sed -i 's#ARCH =.*#ARCH = IBMz19664#' Make.inc
-                %endif
-		%ifarch s390 
-			sed -i 's#ARCH =.*#ARCH = IBMz19632#' Make.inc
-                %endif
-		sed -i 's#-march=z196#-march=z9-109 -mtune=z196#' Make.inc
-		sed -i 's#-march=z10 -mtune=z196#-march=z9-109 -mtune=z196#' Make.inc
-		sed -i 's#-march=z10#-march=z9-109 -mtune=z10#' Make.inc
-		sed -i 's#-DATL_ARCH_IBMz196#-DATL_ARCH_IBMz9#' Make.inc
-		sed -i 's#-DATL_ARCH_IBMz10#-DATL_ARCH_IBMz9#' Make.inc
-		sed -i 's#-DATL_ARCH_IBMz9#-DATL_ARCH_IBMz9#' Make.inc
-	elif [ "$type" = "z10" ]; then
-		%ifarch s390x 
-			sed -i 's#ARCH =.*#ARCH = IBMz1064#' Make.inc
-                %endif
-		%ifarch s390 
-			sed -i 's#ARCH =.*#ARCH = IBMz1032#' Make.inc
-                %endif
-		sed -i 's#-march=z196#-march=z10#' Make.inc
-		sed -i 's#-march=z10 -mtune=z196#-march=z10#' Make.inc
-		sed -i 's#-march=z9-109#-march=z10#' Make.inc
-		sed -i 's#-DATL_ARCH_IBMz196#-DATL_ARCH_IBMz10#' Make.inc
-		sed -i 's#-DATL_ARCH_IBMz9#-DATL_ARCH_IBMz10#' Make.inc
-		%define pr_z10 %(echo $((%{__isa_bits}+1)))
-	elif [ "$type" = "z196" ]; then
-		%ifarch s390x 
-			sed -i 's#ARCH =.*#ARCH = IBMz19664#' Make.inc
-                %endif
-		%ifarch s390 
-			sed -i 's#ARCH =.*#ARCH = IBMz19632#' Make.inc
-                %endif
-		sed -i 's#-march=z196#-march=z10 -mtune=z196#' Make.inc
-		sed -i 's#-march=z10#-march=z10 -mtune=z196#' Make.inc
-		sed -i 's#-march=z9-109#-march=z10 -mtune=z196#' Make.inc
-		sed -i 's#-DATL_ARCH_IBMz10#-DATL_ARCH_IBMz196#' Make.inc
-		sed -i 's#-DATL_ARCH_IBMz9#-DATL_ARCH_IBMz196#' Make.inc
-		%define pr_z196 %(echo $((%{__isa_bits}+2)))
-	fi
-%endif
-
 %endif
 	make build
 	cd lib
@@ -406,13 +318,13 @@ rm -rf %{buildroot}
 
 %posttrans devel
 if [ $1 -eq 0 ] ; then
-/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
 		%{_includedir}/atlas-%{_arch}-base %{pr_base}
 fi
 
 %preun devel
 if [ $1 -ge 0 ] ; then
-/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-base
+/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-base
 fi
 
 %if "%{?enable_native_atlas}" == "0"
@@ -424,13 +336,13 @@ fi
 
 %posttrans sse3-devel
 if [ $1 -eq 0 ] ; then
-/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+/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
+/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-sse3
 fi
 
 %endif
@@ -442,13 +354,13 @@ fi
 
 %posttrans 3dnow-devel
 if [ $1 -eq 0 ] ; then
-/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+/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
+/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-3dnow
 fi
 
 %post -n atlas-sse -p /sbin/ldconfig
@@ -457,13 +369,13 @@ fi
 
 %posttrans sse-devel
 if [ $1 -eq 0 ] ; then
-/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+/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
+/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-sse
 fi
 
 %post -n atlas-sse2 -p /sbin/ldconfig
@@ -472,13 +384,13 @@ fi
 
 %posttrans sse2-devel
 if [ $1 -eq 0 ] ; then
-/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+/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
+/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-sse2
 fi
 
 %post -n atlas-sse3 -p /sbin/ldconfig
@@ -487,46 +399,13 @@ fi
 
 %posttrans sse3-devel
 if [ $1 -eq 0 ] ; then
-/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+/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
-
-%ifarch s390 s390x
-%post -n atlas-z10 -p /sbin/ldconfig
-
-%postun -n atlas-z10 -p /sbin/ldconfig
-
-%posttrans z10-devel
-if [ $1 -eq 0 ] ; then
-/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
-		%{_includedir}/atlas-%{_arch}-z10  %{pr_z10}
-fi
-
-%preun z10-devel
-if [ $1 -ge 0 ] ; then
-/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-z10
-fi
-
-%post -n atlas-z196 -p /sbin/ldconfig
-
-%postun -n atlas-z196 -p /sbin/ldconfig
-
-%posttrans z196-devel
-if [ $1 -eq 0 ] ; then
-/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
-		%{_includedir}/atlas-%{_arch}-z196  %{pr_z196}
-fi
-
-%preun z196-devel
-if [ $1 -ge 0 ] ; then
-/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-z196
+/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-sse3
 fi
 
 %endif
@@ -633,40 +512,13 @@ fi
 
 %endif
 
-%ifarch s390 s390x
-%files z10
-%defattr(-,root,root,-)
-%doc doc/README.Fedora
-%dir %{_libdir}/atlas-z10
-%{_libdir}/atlas-z10/*.so.*
-%config(noreplace) /etc/ld.so.conf.d/atlas-%{_arch}-z10.conf
-
-%files z10-devel
-%defattr(-,root,root,-)
-%doc doc
-%{_libdir}/atlas-z10/*.so
-%{_includedir}/atlas-%{_arch}-z10/
-%{_includedir}/*.h
-%ghost %{_includedir}/atlas
-
-%files z196
-%defattr(-,root,root,-)
-%doc doc/README.Fedora
-%dir %{_libdir}/atlas-z196
-%{_libdir}/atlas-z196/*.so.*
-%config(noreplace) /etc/ld.so.conf.d/atlas-%{_arch}-z196.conf
-
-%files z196-devel
-%defattr(-,root,root,-)
-%doc doc
-%{_libdir}/atlas-z196/*.so
-%{_includedir}/atlas-%{_arch}-z196/
-%{_includedir}/*.h
-%ghost %{_includedir}/atlas
-%endif
 %endif
 
 %changelog
+* Fri May 25 2012 NAKAMURA Kenta <kenta@vinelinux.org> - 3.8.4-5
+- added Japanese Summary
+- turned off throttle checking
+
 * Thu Mar 15 2012 NAKAMURA Kenta <kenta@vinelinux.org> - 3.8.4-4
 - initial build for Vine Linux