[gdl/el6/master] Update to 0.9.1 Drop numpy and wx patches fixed upstream

Orion Poplawski orion at fedoraproject.org
Wed Mar 30 16:01:21 UTC 2011


commit 33e540ccba6221f75504f6a8a162cd0876e7e1fa
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Mar 30 10:01:00 2011 -0600

    Update to 0.9.1
    Drop numpy and wx patches fixed upstream
    
    Conflicts:
    
    	gdl.spec

 .gitignore             |    1 +
 gdl-0.9rc4-numpy.patch |  234 ------------------------------------------------
 gdl-0.9rc4-wx.patch    |   11 ---
 gdl.spec               |   12 ++--
 sources                |    2 +-
 5 files changed, 8 insertions(+), 252 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 63b4384..716e363 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /gdl-0.9.tar.gz
+/gdl-0.9.1.tar.gz
diff --git a/gdl.spec b/gdl.spec
index b982983..6aceaea 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           gdl
-Version:        0.9
-Release:        6%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
@@ -12,12 +12,10 @@ Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{versi
 Source1:        gdl.csh
 Source2:        gdl.sh
 Source3:        makecvstarball
-Patch1:         gdl-0.9rc4-numpy.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
 Patch4:         gdl-0.9rc3-antlr.patch
 Patch5:         gdl-0.9rc4-antlr-auto.patch
-Patch6:         gdl-0.9rc4-wx.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #RHEL doesn't have the needed antlr version/headers, has old plplot
@@ -82,12 +80,10 @@ Provides:       %{name}-runtime = %{version}-%{release}
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .numpy
 %if !0%{?rhel}
 #patch4 -p1 -b .antlr
 %patch5 -p1 -b .antlr-auto
 %endif
-%patch6 -p1 -b .wx
 %if !0%{?rhel}
 rm -rf src/antlr
 %endif
@@ -175,6 +171,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar 29 2011 Orion Poplawski <orion at cora.nwra.com> - 0.9.1-1
+- Update to 0.9.1
+- Drop numpy and wx patches fixed upstream
+
 * Mon Dec 6 2010 Orion Poplawski <orion at cora.nwra.com> - 0.9-6
 - Add include path to numpy (needed on EL6)
 
diff --git a/sources b/sources
index df2d293..686137e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd357a8b2569629ba8d29078200d45e7  gdl-0.9.tar.gz
+be576675aa1c37f0c1a2b1eb8889a960  gdl-0.9.1.tar.gz


More information about the scm-commits mailing list