From b5a3368ed9312cc1a095f2d6458bbd42e8c3562d Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Jul 08 2010 20:56:23 +0000 Subject: Pull from devel --- diff --git a/.cvsignore b/.cvsignore index 731b008..82ec931 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Healpix_2.12a_2009Aug06a.tar.gz +Healpix_2.13a_2009Nov27.tar.gz diff --git a/healpix.spec b/healpix.spec index aaddae0..327ff36 100644 --- a/healpix.spec +++ b/healpix.spec @@ -1,6 +1,6 @@ Name: healpix Version: 2.13a -Release: 1%{?dist} +Release: 2%{?dist} Summary: Hierarchical Equal Area isoLatitude Pixelization of a sphere Group: Development/Libraries @@ -153,7 +153,7 @@ export CXXFLAGS="$CCFLAGS" export CXXFLAGS_NO_C="$CCFLAGS_NO_C" export CXXCFLAGS="$CCFLAGS" export CXXLFLAGS="%{optflags} -L. -L$DESTLIB" -export CXX_EXTRALIBS="-lcfitsio -lhealpix_cxx -lhealpix_cxxsupport -lhealpix_fft --as-needed" +export CXX_EXTRALIBS="-lcfitsio -lhealpix_cxx -lhealpix_cxxsupport -lhealpix_fft -lgomp --as-needed" # SMP make doesn't work for dir in cxxsupport libfftpack Healpix_cxx alice docsrc; do @@ -315,6 +315,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 17 2010 Lubomir Rintel (Fedora Astronomy) - 2.13a-2 +- Fix build + * Sun Dec 27 2009 Jussi Lehtola - 2.13a-1 - Update to upstream 2.13a. diff --git a/import.log b/import.log index c2f6fe0..1d5d80a 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ healpix-2_11c-3_el5:HEAD:healpix-2.11c-5.el5.src.rpm:1239091049 +healpix-2_13a-2_fc14:EL-6:healpix-2.13a-2.fc14.src.rpm:1278622560 diff --git a/sources b/sources index 1daa3bf..54d44ae 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ 391fa6874977ddaf26feb4909cf90c85 Healpix_2.13a_2009Nov27.tar.gz -2ad20a707f52c064646cfb0e46afa76f healpix-f90test.sh