packages: gdal/gdal-ruby.patch, gdal/gdal.spec, gdal/gdal-dods.patch (REMOV...
jajcus
jajcus at pld-linux.org
Sat Jun 12 18:20:20 CEST 2010
Author: jajcus Date: Sat Jun 12 16:20:20 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- Version: 1.7.2
- updated for ruby 1.9
---- Files affected:
packages/gdal:
gdal-ruby.patch (1.2 -> 1.3) , gdal.spec (1.70 -> 1.71) , gdal-dods.patch (1.3 -> NONE) (REMOVED), gdal-ogdi.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/gdal/gdal-ruby.patch
diff -u packages/gdal/gdal-ruby.patch:1.2 packages/gdal/gdal-ruby.patch:1.3
--- packages/gdal/gdal-ruby.patch:1.2 Tue Jun 10 21:59:46 2008
+++ packages/gdal/gdal-ruby.patch Sat Jun 12 18:20:15 2010
@@ -1,24 +1,27 @@
---- gdal-1.5.1/swig/ruby/RubyMakefile.mk.orig 2006-12-21 03:49:08.000000000 +0100
-+++ gdal-1.5.1/swig/ruby/RubyMakefile.mk 2008-06-06 21:48:10.535282314 +0200
-@@ -17,7 +17,7 @@
+diff -dur gdal-1.7.2.orig/swig/ruby/RubyMakefile.mk gdal-1.7.2/swig/ruby/RubyMakefile.mk
+--- gdal-1.7.2.orig/swig/ruby/RubyMakefile.mk 2010-04-24 01:22:08.000000000 +0200
++++ gdal-1.7.2/swig/ruby/RubyMakefile.mk 2010-06-12 11:15:23.000000000 +0200
+@@ -17,15 +17,15 @@
include $(GDAL_ROOT)/GDALmake.opt
-RUBY_MODULES = gdal.so ogr.so gdalconst.so osr.so
+-RUBY_INCLUDE_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['archdir']")
++RUBY_INCLUDE_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['rubyhdrdir']")
+RUBY_MODULES = gdal.la ogr.la gdalconst.la osr.la
- RUBY_INCLUDE_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['archdir']")
RUBY_LIB_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['libdir']")
RUBY_SO_NAME := $(shell ruby -rrbconfig -e "puts Config::CONFIG['RUBY_SO_NAME']")
-@@ -25,7 +25,7 @@
+ RUBY_EXTENSIONS_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal
- RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR)
--LDFLAGS += -shared -L$(RUBY_LIB_DIR)
-+LDFLAGS += -shared -module -avoid-version -rpath $(INSTALL_DIR) -L$(RUBY_LIB_DIR)
+-RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR)
++RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR) -I$(RUBY_INCLUDE_DIR)/$(shell ruby -rrbconfig -e "puts Config::CONFIG['arch']")
+-LDFLAGS += -Xcompiler -shared -L$(RUBY_LIB_DIR)
++LDFLAGS += -Xcompiler -shared -module -avoid-version -rpath $(INSTALL_DIR) -L$(RUBY_LIB_DIR)
RUBY_LIB := -l$(RUBY_SO_NAME)
build: $(RUBY_MODULES)
-@@ -44,14 +44,14 @@
+@@ -43,14 +43,14 @@
install: $(INSTALL_DIR)
$(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR)
@@ -38,3 +41,70 @@
-%.o: %.c
+%.lo: %.c
$(CC) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
+diff -dur gdal-1.7.2.orig/swig/include/ruby/gdal_ruby.i gdal-1.7.2/swig/include/ruby/gdal_ruby.i
+--- gdal-1.7.2.orig/swig/include/ruby/gdal_ruby.i 2010-04-24 01:22:09.000000000 +0200
++++ gdal-1.7.2/swig/include/ruby/gdal_ruby.i 2010-06-12 14:21:11.000000000 +0200
+@@ -36,7 +36,7 @@
+ CPLXMLNode *psChild;
+ char *pszText = NULL;
+
+- nChildCount = RARRAY(rubyArray)->len - 2;
++ nChildCount = RARRAY_LEN(rubyArray) - 2;
+ if( nChildCount < 0 )
+ {
+ rb_raise(rb_eRuntimeError, "Error in input XMLTree, child count is less than zero.");
+diff -dur gdal-1.7.2.orig/swig/include/ruby/typemaps_ruby.i gdal-1.7.2/swig/include/ruby/typemaps_ruby.i
+--- gdal-1.7.2.orig/swig/include/ruby/typemaps_ruby.i 2010-04-24 01:22:09.000000000 +0200
++++ gdal-1.7.2/swig/include/ruby/typemaps_ruby.i 2010-06-12 14:22:07.000000000 +0200
+@@ -147,7 +147,7 @@
+ Check_Type($input, T_ARRAY);
+
+ /* Get the length */
+- int seq_size = RARRAY($input)->len;
++ int seq_size = RARRAY_LEN($input);
+
+ if ( seq_size != $dim0 ) {
+ rb_raise(rb_eRangeError, "sequence must have length %i.", seq_size);
+@@ -225,7 +225,7 @@
+ Check_Type($input, T_ARRAY);
+
+ /* Get the length */
+- $1 = RARRAY($input)->len;
++ $1 = RARRAY_LEN($input);
+
+ /* Allocate space for the C array. */
+ $2 = (int*) malloc($1*sizeof(int));
+@@ -315,7 +315,7 @@
+ /* Check if is a list */
+ Check_Type($input, T_ARRAY);
+
+- $1 = RARRAY($input)->len;
++ $1 = RARRAY_LEN($input);
+ tmpGCPList = (GDAL_GCP*) malloc($1*sizeof(GDAL_GCP));
+ $2 = tmpGCPList;
+
+@@ -386,7 +386,7 @@
+ /* is the provided object an array or a hash? */
+ if ( TYPE($input) == T_ARRAY) {
+ /* get the size of the array */
+- int size = RARRAY($input)->len;
++ int size = RARRAY_LEN($input);
+
+ for (int i = 0; i < size; i++) {
+ /* get the ruby object */
+@@ -489,7 +489,7 @@
+ /* Check if is a list */
+ Check_Type($input, T_ARRAY);
+
+- int size = RARRAY($input)->len;
++ int size = RARRAY_LEN($input);
+ for (int i = 0; i < size; i++) {
+ VALUE item = rb_ary_entry($input, i);
+ char *pszItem = StringValuePtr(item);
+@@ -744,4 +744,4 @@
+ /* %typemap(out) GByte* */
+
+ /* Stops insertion of default type map. */
+-}
+\ No newline at end of file
++}
================================================================
Index: packages/gdal/gdal.spec
diff -u packages/gdal/gdal.spec:1.70 packages/gdal/gdal.spec:1.71
--- packages/gdal/gdal.spec:1.70 Mon Jun 7 20:13:23 2010
+++ packages/gdal/gdal.spec Sat Jun 12 18:20:15 2010
@@ -1,5 +1,5 @@
# $Revision$, $Date$
-# TODO: csharp, java
+# TODO: csharp, java, mysql
#
# Conditional build:
%bcond_without odbc # disable odbc support
@@ -9,18 +9,16 @@
Summary: Geospatial Data Abstraction Library
Summary(pl.UTF-8): Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
Name: gdal
-Version: 1.6.1
-Release: 6
+Version: 1.7.2
+Release: 0.1
License: BSD-like
Group: Libraries
Source0: ftp://ftp.remotesensing.org/gdal/%{name}-%{version}.tar.gz
-# Source0-md5: 4059285a5cef41ff975ed0ec02a97009
-Patch0: %{name}-dods.patch
-Patch1: %{name}-perl.patch
-Patch2: %{name}-ruby.patch
-Patch3: %{name}-asneeded.patch
-Patch4: %{name}-ogdi.patch
-Patch5: %{name}-python_install.patch
+# Source0-md5: 05351f8cb61761ae579667e24a297fe6
+Patch0: %{name}-perl.patch
+Patch1: %{name}-ruby.patch
+Patch2: %{name}-asneeded.patch
+Patch3: %{name}-python_install.patch
URL: http://www.gdal.org/
BuildRequires: autoconf >= 2.52
BuildRequires: automake
@@ -174,11 +172,13 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
# need to regenerate (old ones don't support perl 5.10)
rm swig/perl/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}
+# includes updated for Ruby 1.9
+rm swig/ruby/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}
+
+rm -rf man
%build
# $PYTHON_INCLUDES is set only with --with-ogpython, but we have --with-python,
@@ -209,11 +209,14 @@
# regenerate where needed
%{__make} -j1 -C swig/perl generate
+%{__make} -j1 -C swig/ruby generate
%{__make} -j1
%{__make} -j1 docs
+%{__make} -j1 man
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -328,6 +331,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.71 2010/06/12 16:20:15 jajcus
+- Version: 1.7.2
+- updated for ruby 1.9
+
Revision 1.70 2010/06/07 18:13:23 hawk
- release 6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdal/gdal-ruby.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdal/gdal.spec?r1=1.70&r2=1.71&f=u
More information about the pld-cvs-commit
mailing list