diff --git a/.gitignore b/.gitignore index afc444d..cd36538 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ scotch_5.1.8.tar.gz +/scotch_5.1.10b.tar.gz diff --git a/scotch-Makefile.inc.in b/scotch-Makefile.inc.in index 3a75499..9850e23 100644 --- a/scotch-Makefile.inc.in +++ b/scotch-Makefile.inc.in @@ -12,9 +12,9 @@ CCD = mpicc CFLAGS = @RPMFLAGS@ -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_FILE_COMPRESS_BZ2 -DCOMMON_FILE_COMPRESS_LZMA -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64 LDFLAGS = -lpthread -lz -lbz2 -llzmadec -lm -lrt CP = cp -a -LEX = flex +LEX = flex -Pscotchyy -olex.yy.c LN = ln MKDIR = mkdir -p MV = mv RANLIB = ranlib -YACC = bison -y +YACC = bison -pscotchyy -y -b y diff --git a/scotch.spec b/scotch.spec index fc2994d..beb950c 100644 --- a/scotch.spec +++ b/scotch.spec @@ -1,6 +1,6 @@ Summary: Graph, mesh and hypergraph partitioning library Name: scotch -Version: 5.1.8 +Version: 5.1.10b Release: 1%{?dist} License: CeCILL-C Group: Development/Libraries @@ -22,14 +22,6 @@ Requires: %{name} = %{version}-%{release} %description devel This package contains development libraries for scotch. -%package static -Summary: Development libraries for scotch -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} - -%description static -This package contains libscotch static libraries. - %prep %setup -q -n scotch_%{version} sed s/@RPMFLAGS@/'%{optflags} -fPIC'/ < %SOURCE1 > src/Makefile.inc @@ -66,14 +58,18 @@ rm -rf %{buildroot} pushd src/ make install prefix=%{buildroot}%{_prefix} libdir=%{buildroot}%{_libdir} popd +cp -r include/*metis.h %{buildroot}%{_includedir}/ + pushd lib for static_libs in lib*scotch*.a ; do libs=`basename $static_libs .a` ln -s $libs.so.0.0 $libs.so.0 ln -s $libs.so.0.0 $libs.so + rm -f $static_libs done cp -dp lib*scotch*.so* %{buildroot}%{_libdir}/ popd +rm -f %{buildroot}%{_libdir}/*.a rm -f %{buildroot}%{_bindir}/* rm -f %{buildroot}%{_mandir}/man1/* @@ -115,12 +111,16 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{_libdir}/lib*scotch*.so %{_includedir}/*scotch*.h - -%files static -%defattr(-,root,root,-) -%{_libdir}/lib*scotch*.a +%{_includedir}/*metis.h %changelog +* Tue Oct 19 2010 Deji Akingunola - 5.1.9-10b +- Update to 5.1.10b + +* Thu Aug 12 2010 Deji Akingunola - 5.1.9-1 +- Update to 5.1.9 +- No more static builds + * Tue Apr 27 2010 Deji Akingunola - 5.1.8-1 - Update to 5.1.8 diff --git a/sources b/sources index dfcbb0e..d96d57f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a22e1ae0015375fa0cc8fc3ee033b8ad scotch_5.1.8.tar.gz +9b8622b39c141ecaca4a46298486fd99 scotch_5.1.10b.tar.gz