- Update to 0.9rc2 cvs 20090224

- Fix release tag
- Drop ImageMagick patch fixed upstream
This commit is contained in:
Orion Poplawski 2009-02-24 16:29:05 +00:00
parent 1650fe40e6
commit 5de4b0f5d2
5 changed files with 13 additions and 9290 deletions

View File

@ -1 +1 @@
gdl-0.9rc2.tar.gz
gdl-0.9rc2-20090224.tar.bz2

View File

@ -1,23 +0,0 @@
--- gdl-0.9rc1/configure.magick 2008-05-16 11:45:56.000000000 -0600
+++ gdl-0.9rc1/configure 2008-05-16 11:48:06.000000000 -0600
@@ -20655,16 +20655,16 @@
INCLUDES="$INCLUDES -I$with_Magick/include"
else
LIBS="$LIBS -lMagick++"
- INCLUDES="$INCLUDES -I/usr/include/magick"
+ INCLUDES="$INCLUDES -I/usr/include/ImageMagick"
fi
- { echo "$as_me:$LINENO: checking for GetMagickVersion in -lMagick" >&5
-echo $ECHO_N "checking for GetMagickVersion in -lMagick... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for GetMagickVersion in -lMagick++" >&5
+echo $ECHO_N "checking for GetMagickVersion in -lMagick++... $ECHO_C" >&6; }
if test "${ac_cv_lib_Magick_GetMagickVersion+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lMagick $LIBS"
+LIBS="-lMagick++ $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF

File diff suppressed because it is too large Load Diff

View File

@ -1,18 +1,19 @@
Name: gdl
Version: 0.9
Release: 0.rc2.1%{?dist}
Release: 0.2.rc2.20090224%{?dist}
Summary: GNU Data Language
Group: Applications/Engineering
License: GPLv2+
URL: http://gnudatalanguage.sourceforge.net/
Source0: http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc2.tar.gz
#Source0: http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc2.tar.bz2
# cvs -z3 -d :pserver:anonymous@gnudatalanguage.cvs.sourceforge.net:/cvsroot/gnudatalanguage export -D 20090224 -d gdl-0.9rc2-20090224 gdl
# tar cjf gdl-0.9rc2-20090224.tar.bz2 gdl-0.9rc2-20090224
Source0: http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc2-20090224.tar.bz2
Source1: gdl.csh
Source2: gdl.sh
Patch0: gdl-0.9rc2-cvs.patch
Patch1: gdl-0.9pre5-ppc64.patch
Patch2: gdl-0.9rc1-gcc43.patch
Patch3: gdl-0.9rc1-magick.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: readline-devel, ncurses-devel
@ -20,7 +21,6 @@ BuildRequires: gsl-devel, plplot-devel, ImageMagick-c++-devel
BuildRequires: netcdf-devel, hdf5-devel, libjpeg-devel
BuildRequires: python-devel, python-numarray, python-matplotlib
BuildRequires: fftw-devel, hdf-devel, proj-devel
# Needed to pull in drivers
Requires: plplot
@ -32,11 +32,9 @@ Systems Inc.
%prep
%setup -q -n %{name}-%{version}rc2
%patch0 -p1 -b .cvs
%setup -q -n %{name}-%{version}rc2-20090224
%patch1 -p1 -b .ppc64
%patch2 -p1 -b .gcc43
%patch3 -p1 -b .magick
%build
@ -75,6 +73,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Feb 24 2009 - Orion Poplawski <orion@cora.nwra.com> - 0.9-0.2.rc2.20090224
- Update to 0.9rc2 cvs 20090224
- Fix release tag
- Drop ImageMagick patch fixed upstream
* Fri Jan 23 2009 - Orion Poplawski <orion@cora.nwra.com> - 0.9-0.rc2.1
- Update to 0.9rc2 based cvs

View File

@ -1 +1 @@
4ae52c19cdd6f4684b8e0b6ce8a9902c gdl-0.9rc2.tar.gz
8f8bfebdf2011532b68918eee2899c6e gdl-0.9rc2-20090224.tar.bz2