[gdl/f13/master] - Update to 0.9 final - Drop wx-config, GLDLexer, and python patches - Fix GDL_PATH in profile scrip

[Orion Poplawski]

commit 81f78f07b61038281da27042894bf9b2ee3eb503
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Sep 15 15:56:09 2010 -0600

    - Update to 0.9 final
    - Drop wx-config, GLDLexer, and python patches
    - Fix GDL_PATH in profile scripts (bug #634251)

 .gitignore                 |    2 +-
 gdl-0.9rc4-GDLLexer.patch  |   11 -----------
 gdl-0.9rc4-python.patch    |   28 ----------------------------
 gdl-0.9rc4-wx-config.patch |   27 ---------------------------
 gdl.csh                    |    2 +-
 gdl.sh                     |    2 +-
 gdl.spec                   |   20 ++++++++++----------
 sources                    |    2 +-
 8 files changed, 14 insertions(+), 80 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2585ff6..9bec119 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-gdl-0.9rc4.tar.gz
+gdl-0.9.tar.gz
diff --git a/gdl.csh b/gdl.csh
index 5ab353a..12cde5c 100644
--- a/gdl.csh
+++ b/gdl.csh
@@ -2,4 +2,4 @@
 if ( $?GDL_PATH ) then
 	exit
 endif
-setenv GDL_PATH +/usr/share/gdl
+setenv GDL_PATH +/usr/share/gnudatalanguage
diff --git a/gdl.sh b/gdl.sh
index a6304cc..3ee18c6 100644
--- a/gdl.sh
+++ b/gdl.sh
@@ -1,3 +1,3 @@
 # Make sure GDL_PATH is set
-[ -z "$GDL_PATH" ] && GDL_PATH="+/usr/share/gdl"
+[ -z "$GDL_PATH" ] && GDL_PATH="+/usr/share/gnudatalanguage"
 export GDL_PATH
diff --git a/gdl.spec b/gdl.spec
index 4230220..09efa5f 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -2,19 +2,16 @@
 
 Name:           gdl
 Version:        0.9
-Release:        0.10.rc4%{?dist}
+Release:        1%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://gnudatalanguage.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc4.tar.gz
+Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}.tar.gz
 Source1:        gdl.csh
 Source2:        gdl.sh
 Source3:        makecvstarball
-Patch0:         gdl-0.9rc4-wx-config.patch
-Patch1:         gdl-0.9rc4-GDLLexer.patch
-Patch2:         gdl-0.9rc4-python.patch
 # Build with system antlr library.  Request for upstream change here:
 # https://sourceforge.net/tracker/index.php?func=detail&aid=2685215&group_id=97659&atid=618686
 Patch3:         gdl-0.9rc3-antlr.patch
@@ -48,7 +45,7 @@ Provides:       %{name}-runtime = %{version}-%{release}
 
 %description
 A free IDL (Interactive Data Language) compatible incremental compiler
-(ie. runs IDL programs). IDL is a registered trademark of Research
+(i.e. runs IDL programs). IDL is a registered trademark of Research
 Systems Inc.
 
 
@@ -77,10 +74,7 @@ Provides:       %{name}-runtime = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{name}-%{version}rc4
-%patch0 -p1 -b .wx-config
-%patch1 -p1 -b .GDLLexer
-%patch2 -p1 -b .python
+%setup -q -n %{name}-%{version}
 %if !0%{?rhel}
 #patch3 -p1 -b .antlr
 %patch4 -p1 -b .antlr-auto
@@ -167,6 +161,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 15 2010 Orion Poplawski <orion at cora.nwra.com> - 0.9-1
+- Update to 0.9 final
+- Drop wx-config, GLDLexer, and python patches
+- Fix GDL_PATH in profile scripts (bug #634251)
+
+
 * Wed Feb 15 2010 Orion Poplawski <orion at cora.nwra.com> - 0.9-0.10.rc4
 - Update to 0.9rc4
 - Enable grib, udunits2, and wxWidgets support
diff --git a/sources b/sources
index f7a4204..df2d293 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dcef0d75308a13856a799d12755c80a3  gdl-0.9rc4.tar.gz
+dd357a8b2569629ba8d29078200d45e7  gdl-0.9.tar.gz