[saga] New upstream release 2.1.2
Volker Fröhlich
volter at fedoraproject.org
Fri May 16 11:58:20 UTC 2014
commit 0c3fb1803aae4f1dc52478feea893be7b59cf776
Author: Volker Fröhlich <volker27 at gmx.at>
Date: Fri May 16 13:57:54 2014 +0200
New upstream release 2.1.2
.gitignore | 1 +
saga-2.0.8-use-system-version-of-grib2.patch | 22 -
saga-2.1.0-e00.patch | 57 -
saga-2.1.0-poly.patch | 78 --
saga-2.1.1-dxflib.patch | 49 -
saga-2.1.1-polyclipping6-api.patch | 26 -
saga-2.1.1-remove-references-to-libfire.patch | 18 -
saga-2.1.2-dxflib.patch | 42 +
saga-2.1.2-e00.patch | 36 +
saga-2.1.2-format.patch | 39 +
saga-2.1.0-g2clib.patch => saga-2.1.2-g2clib.patch | 21 +-
saga-2.1.2-poly.patch | 1195 ++++++++++++++++++++
saga-2.1.2-remove-references-to-libfire.patch | 17 +
saga-2.1.2-use-system-version-of-grib2.patch | 12 +
saga.spec | 64 +-
saga_tarball.sh | 7 +-
sources | 2 +-
17 files changed, 1368 insertions(+), 318 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c9bc29e..b99a742 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/saga_2.0.8-fedora.tar.gz
/saga_2.1.1-fedora.tar.gz
+/saga_2.1.2-fedora.tar.gz
diff --git a/saga-2.1.2-dxflib.patch b/saga-2.1.2-dxflib.patch
new file mode 100644
index 0000000..533c0cd
--- /dev/null
+++ b/saga-2.1.2-dxflib.patch
@@ -0,0 +1,42 @@
+diff -Nur saga-2.1.2-fedora/configure saga-2.1.2-fedora-dxflib/configure
+--- saga-2.1.2-fedora/configure 2014-05-09 13:07:37.000000000 +0200
++++ saga-2.1.2-fedora-dxflib/configure 2014-05-15 23:19:54.472251869 +0200
+@@ -17769,7 +17769,7 @@
+
+ fi
+ #AC_CONFIG_FILES([Makefile])
+-ac_config_files="$ac_config_files Makefile src/Makefile src/saga_core/Makefile src/saga_core/saga_api/Makefile src/saga_core/saga_gdi/Makefile src/saga_core/saga_gui/Makefile src/saga_core/saga_gui/man/Makefile src/saga_core/saga_cmd/Makefile src/saga_core/saga_cmd/man/Makefile src/modules/Makefile src/modules/climate/Makefile src/modules/climate/climate_tools/Makefile src/modules/contrib/Makefile src/modules/contrib/contrib_peregro/Makefile src/modules/db/Makefile src/modules/db/db_odbc/Makefile src/modules/db/db_pgsql/Makefile src/modules/docs/Makefile src/modules/docs/docs_html/Makefile src/modules/docs/docs_pdf/Makefile src/modules/garden/Makefile src/modules/garden/garden_3d_viewer/Makefile src/modules/garden/garden_fractals/Makefile src/modules/garden/garden_games/Makefile src/modules/garden/garden_learn_to_program/Makefile src/modules/garden/garden_webservices/Makefile src/modules/grid/Makefile src/modules/grid/grid_analysis/Makefile src/modules/grid/grid_calculus/Ma
kefile src/modules/grid/grid_calculus_bsl/Makefile src/modules/grid/grid_filter/Makefile src/modules/grid/grid_gridding/Makefile src/modules/grid/grid_spline/Makefile src/modules/grid/grid_tools/Makefile src/modules/grid/grid_visualisation/Makefile src/modules/imagery/Makefile src/modules/imagery/imagery_classification/Makefile src/modules/imagery/imagery_opencv/Makefile src/modules/imagery/imagery_photogrammetry/Makefile src/modules/imagery/imagery_rga/Makefile src/modules/imagery/imagery_segmentation/Makefile src/modules/imagery/imagery_svm/Makefile src/modules/imagery/imagery_tools/Makefile src/modules/imagery/imagery_vigra/Makefile src/modules/io/Makefile src/modules/io/io_esri_e00/Makefile src/modules/io/io_gdal/Makefile src/modules/io/io_gps/Makefile src/modules/io/io_grid/Makefile src/modules/io/io_grid_grib2/Makefile src/modules/io/io_grid_image/Makefile src/modules/io/io_shapes/Makefile src/modules/io/io_shapes_dxf/Makefile src/modules/io/io_shapes_las/Makefile src/
modules/io/io_table/Makefile src/modules/io/io_virtual/Makefile src/modules/pointcloud/Makefile src/modules/pointcloud/pointcloud_tools/Makefile src/modules/pointcloud/pointcloud_viewer/Makefile src/modules/projection/Makefile src/modules/projection/pj_georeference/Makefile src/modules/projection/pj_proj4/Makefile src/modules/shapes/Makefile src/modules/shapes/shapes_grid/Makefile src/modules/shapes/shapes_lines/Makefile src/modules/shapes/shapes_points/Makefile src/modules/shapes/shapes_polygons/Makefile src/modules/shapes/shapes_tools/Makefile src/modules/shapes/shapes_transect/Makefile src/modules/simulation/Makefile src/modules/simulation/sim_cellular_automata/Makefile src/modules/simulation/sim_ecosystems_hugget/Makefile src/modules/simulation/sim_erosion/Makefile src/modules/simulation/sim_fire_spreading/Makefile src/modules/simulation/sim_hydrology/Makefile src/modules/simulation/sim_ihacres/Makefile src/modules/statistics/Makefile src/modules/statistics/statistics_gr
id/Makefile src/modules/statistics/statistics_kriging/Makefile src/modules/statistics/statistics_points/Makefile src/modules/statistics/statistics_regression/Makefile src/modules/table/Makefile src/modules/table/table_calculus/Makefile src/modules/table/table_tools/Makefile src/modules/terrain_analysis/Makefile src/modules/terrain_analysis/ta_channels/Makefile src/modules/terrain_analysis/ta_compound/Makefile src/modules/terrain_analysis/ta_hydrology/Makefile src/modules/terrain_analysis/ta_lighting/Makefile src/modules/terrain_analysis/ta_morphometry/Makefile src/modules/terrain_analysis/ta_preprocessor/Makefile src/modules/terrain_analysis/ta_profiles/Makefile src/modules/terrain_analysis/ta_slope_stability/Makefile src/modules/tin/Makefile src/modules/tin/tin_tools/Makefile src/modules/tin/tin_viewer/Makefile"
++ac_config_files="$ac_config_files Makefile src/Makefile src/saga_core/Makefile src/saga_core/saga_api/Makefile src/saga_core/saga_gdi/Makefile src/saga_core/saga_gui/Makefile src/saga_core/saga_gui/man/Makefile src/saga_core/saga_cmd/Makefile src/saga_core/saga_cmd/man/Makefile src/modules/Makefile src/modules/climate/Makefile src/modules/climate/climate_tools/Makefile src/modules/contrib/Makefile src/modules/contrib/contrib_peregro/Makefile src/modules/db/Makefile src/modules/db/db_odbc/Makefile src/modules/db/db_pgsql/Makefile src/modules/docs/Makefile src/modules/docs/docs_html/Makefile src/modules/docs/docs_pdf/Makefile src/modules/garden/Makefile src/modules/garden/garden_3d_viewer/Makefile src/modules/garden/garden_fractals/Makefile src/modules/garden/garden_games/Makefile src/modules/garden/garden_learn_to_program/Makefile src/modules/garden/garden_webservices/Makefile src/modules/grid/Makefile src/modules/grid/grid_analysis/Makefile src/modules/grid/grid_calculus/Ma
kefile src/modules/grid/grid_calculus_bsl/Makefile src/modules/grid/grid_filter/Makefile src/modules/grid/grid_gridding/Makefile src/modules/grid/grid_spline/Makefile src/modules/grid/grid_tools/Makefile src/modules/grid/grid_visualisation/Makefile src/modules/imagery/Makefile src/modules/imagery/imagery_classification/Makefile src/modules/imagery/imagery_opencv/Makefile src/modules/imagery/imagery_photogrammetry/Makefile src/modules/imagery/imagery_rga/Makefile src/modules/imagery/imagery_segmentation/Makefile src/modules/imagery/imagery_svm/Makefile src/modules/imagery/imagery_tools/Makefile src/modules/imagery/imagery_vigra/Makefile src/modules/io/Makefile src/modules/io/io_esri_e00/Makefile src/modules/io/io_gdal/Makefile src/modules/io/io_gps/Makefile src/modules/io/io_grid/Makefile src/modules/io/io_grid_grib2/Makefile src/modules/io/io_grid_image/Makefile src/modules/io/io_shapes/Makefile src/modules/io/io_shapes_las/Makefile src/modules/io/io_table/Makefile src/modul
es/io/io_virtual/Makefile src/modules/pointcloud/Makefile src/modules/pointcloud/pointcloud_tools/Makefile src/modules/pointcloud/pointcloud_viewer/Makefile src/modules/projection/Makefile src/modules/projection/pj_georeference/Makefile src/modules/projection/pj_proj4/Makefile src/modules/shapes/Makefile src/modules/shapes/shapes_grid/Makefile src/modules/shapes/shapes_lines/Makefile src/modules/shapes/shapes_points/Makefile src/modules/shapes/shapes_polygons/Makefile src/modules/shapes/shapes_tools/Makefile src/modules/shapes/shapes_transect/Makefile src/modules/simulation/Makefile src/modules/simulation/sim_cellular_automata/Makefile src/modules/simulation/sim_ecosystems_hugget/Makefile src/modules/simulation/sim_erosion/Makefile src/modules/simulation/sim_fire_spreading/Makefile src/modules/simulation/sim_hydrology/Makefile src/modules/simulation/sim_ihacres/Makefile src/modules/statistics/Makefile src/modules/statistics/statistics_grid/Makefile src/modules/statistics/sta
tistics_kriging/Makefile src/modules/statistics/statistics_points/Makefile src/modules/statistics/statistics_regression/Makefile src/modules/table/Makefile src/modules/table/table_calculus/Makefile src/modules/table/table_tools/Makefile src/modules/terrain_analysis/Makefile src/modules/terrain_analysis/ta_channels/Makefile src/modules/terrain_analysis/ta_compound/Makefile src/modules/terrain_analysis/ta_hydrology/Makefile src/modules/terrain_analysis/ta_lighting/Makefile src/modules/terrain_analysis/ta_morphometry/Makefile src/modules/terrain_analysis/ta_preprocessor/Makefile src/modules/terrain_analysis/ta_profiles/Makefile src/modules/terrain_analysis/ta_slope_stability/Makefile src/modules/tin/Makefile src/modules/tin/tin_tools/Makefile src/modules/tin/tin_viewer/Makefile"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -18975,7 +18975,6 @@
+ "src/modules/io/io_grid_grib2/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_grid_grib2/Makefile" ;;
+ "src/modules/io/io_grid_image/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_grid_image/Makefile" ;;
+ "src/modules/io/io_shapes/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_shapes/Makefile" ;;
+- "src/modules/io/io_shapes_dxf/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_shapes_dxf/Makefile" ;;
+ "src/modules/io/io_shapes_las/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_shapes_las/Makefile" ;;
+ "src/modules/io/io_table/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_table/Makefile" ;;
+ "src/modules/io/io_virtual/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_virtual/Makefile" ;;
+diff -Nur saga-2.1.2-fedora/configure.ac saga-2.1.2-fedora-dxflib/configure.ac
+--- saga-2.1.2-fedora/configure.ac 2014-05-09 12:24:43.000000000 +0200
++++ saga-2.1.2-fedora-dxflib/configure.ac 2014-05-15 23:19:41.289197484 +0200
+@@ -255,7 +255,6 @@
+ src/modules/io/io_grid_grib2/Makefile \
+ src/modules/io/io_grid_image/Makefile \
+ src/modules/io/io_shapes/Makefile \
+- src/modules/io/io_shapes_dxf/Makefile \
+ src/modules/io/io_shapes_las/Makefile \
+ src/modules/io/io_table/Makefile \
+ src/modules/io/io_virtual/Makefile \
+diff -Nur saga-2.1.2-fedora/src/modules/io/Makefile.am saga-2.1.2-fedora-dxflib/src/modules/io/Makefile.am
+--- saga-2.1.2-fedora/src/modules/io/Makefile.am 2014-05-09 12:24:51.000000000 +0200
++++ saga-2.1.2-fedora-dxflib/src/modules/io/Makefile.am 2014-05-15 23:21:21.212609617 +0200
+@@ -1,5 +1,5 @@
+ if WITH_GUI
+-SUBDIRS = io_esri_e00 io_gdal io_gps io_grid io_grid_grib2 io_grid_image io_shapes io_shapes_dxf io_shapes_las io_table io_virtual
++SUBDIRS = io_esri_e00 io_gdal io_gps io_grid io_grid_grib2 io_grid_image io_shapes io_shapes_las io_table io_virtual
+ else
+-SUBDIRS = io_esri_e00 io_gdal io_gps io_grid io_grid_grib2 io_shapes io_shapes_dxf io_shapes_las io_table io_virtual
++SUBDIRS = io_esri_e00 io_gdal io_gps io_grid io_grid_grib2 io_shapes io_shapes_las io_table io_virtual
+ endif
diff --git a/saga-2.1.2-e00.patch b/saga-2.1.2-e00.patch
new file mode 100644
index 0000000..172ab94
--- /dev/null
+++ b/saga-2.1.2-e00.patch
@@ -0,0 +1,36 @@
+diff -Nur saga-2.1.2-fedora/src/modules/io/io_esri_e00/ESRI_E00_Import.h saga-2.1.2-fedora-e00/src/modules/io/io_esri_e00/ESRI_E00_Import.h
+--- saga-2.1.2-fedora/src/modules/io/io_esri_e00/ESRI_E00_Import.h 2014-05-09 12:24:52.000000000 +0200
++++ saga-2.1.2-fedora-e00/src/modules/io/io_esri_e00/ESRI_E00_Import.h 2014-05-15 23:14:31.095916581 +0200
+@@ -67,7 +67,7 @@
+ //---------------------------------------------------------
+ #include "MLB_Interface.h"
+
+-#include "./e00compr/e00compr.h"
++#include <e00compr/e00compr.h>
+
+ //---------------------------------------------------------
+ class CESRI_E00_Import : public CSG_Module
+diff -Nur saga-2.1.2-fedora/src/modules/io/io_esri_e00/Makefile.am saga-2.1.2-fedora-e00/src/modules/io/io_esri_e00/Makefile.am
+--- saga-2.1.2-fedora/src/modules/io/io_esri_e00/Makefile.am 2014-05-09 12:24:52.000000000 +0200
++++ saga-2.1.2-fedora-e00/src/modules/io/io_esri_e00/Makefile.am 2014-05-15 23:17:04.150548913 +0200
+@@ -15,18 +15,8 @@
+ libio_esri_e00_la_SOURCES =\
+ ESRI_E00_Import.cpp\
+ MLB_Interface.cpp\
+-e00compr/cpl_conv.c\
+-e00compr/cpl_error.c\
+-e00compr/cpl_vsisimple.c\
+-e00compr/e00read.c\
+-e00compr/e00write.c\
+ ESRI_E00_Import.h\
+-MLB_Interface.h\
+-e00compr/cpl_conv.h\
+-e00compr/cpl_error.h\
+-e00compr/cpl_port.h\
+-e00compr/cpl_vsi.h\
+-e00compr/e00compr.h
++MLB_Interface.h
+
+-libio_esri_e00_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
++libio_esri_e00_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la $(libdir)/e00compr.a
+
diff --git a/saga-2.1.2-format.patch b/saga-2.1.2-format.patch
new file mode 100644
index 0000000..341baa6
--- /dev/null
+++ b/saga-2.1.2-format.patch
@@ -0,0 +1,39 @@
+diff -Nur saga-2.1.2-fedora/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.c saga-2.1.2-fedora-format/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.c
+--- saga-2.1.2-fedora/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.c 2014-05-09 12:24:49.000000000 +0200
++++ saga-2.1.2-fedora-format/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.c 2014-05-16 00:23:02.962580697 +0200
+@@ -225,7 +225,7 @@
+ cp4 = cp2;
+ }
+
+- fprintf (protfile, cp1);
++ fprintf (protfile, "%s", cp1);
+
+ if (fil -> art == 'E')
+ {
+@@ -415,7 +415,7 @@
+ cp4 = cp2;
+ }
+
+- sprintf (fmessage + sl_all, cp1);
++ sprintf (fmessage + sl_all, "%s", cp1);
+ sl_all = strlen (fmessage);
+
+ sl_alt = strlen (*error_list);
+@@ -577,7 +577,7 @@
+
+ va_end (ap);
+
+- fprintf (protfile, cp1);
++ fprintf (protfile, "%s", cp1);
+
+ if (fil -> art == 'E')
+ {
+@@ -756,7 +756,7 @@
+
+ va_end (ap);
+
+- sprintf (fmessage + sl_all, cp1);
++ sprintf (fmessage + sl_all, "%s", cp1);
+ sl_all = strlen (fmessage);
+
+ sl_alt = strlen (*error_list);
diff --git a/saga-2.1.0-g2clib.patch b/saga-2.1.2-g2clib.patch
similarity index 72%
rename from saga-2.1.0-g2clib.patch
rename to saga-2.1.2-g2clib.patch
index e5b0448..8578be9 100644
--- a/saga-2.1.0-g2clib.patch
+++ b/saga-2.1.2-g2clib.patch
@@ -1,17 +1,7 @@
-From 111abb5acfa5c966ff0dc1c9e187454b072ba5ff Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= <volker27 at gmx.at>
-Date: Fri, 10 Jan 2014 23:54:07 +0100
-Subject: [PATCH 2/4] Use the system version of g2clib
-
----
- src/modules_io/grid/io_grid_grib2/Makefile.am | 50 +--------------------------
- 1 file changed, 1 insertion(+), 49 deletions(-)
-
-diff --git a/src/modules_io/grid/io_grid_grib2/Makefile.am b/src/modules_io/grid/io_grid_grib2/Makefile.am
-index 2d6ff24..7e006ae 100644
---- a/src/modules_io/grid/io_grid_grib2/Makefile.am
-+++ b/src/modules_io/grid/io_grid_grib2/Makefile.am
-@@ -11,57 +11,9 @@ DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -DUSE_JPEG200
+diff -Nur saga-2.1.2-fedora/src/modules/io/io_grid_grib2/Makefile.am saga-2.1.2-fedora-g2clib/src/modules/io/io_grid_grib2/Makefile.am
+--- saga-2.1.2-fedora/src/modules/io/io_grid_grib2/Makefile.am 2014-05-09 12:24:51.000000000 +0200
++++ saga-2.1.2-fedora-g2clib/src/modules/io/io_grid_grib2/Makefile.am 2014-05-15 23:03:05.216072422 +0200
+@@ -11,57 +11,9 @@
CXX_INCS = -I$(top_srcdir)/src/saga_core $(LOCAL_INCS)
AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
#AM_LDFLAGS = -fPIC -shared -avoid-version -lpq -ljasper
@@ -70,6 +60,3 @@ index 2d6ff24..7e006ae 100644
grib2_import.cpp\
MLB_Interface.cpp\
grib2_import.h\
---
-1.8.1.4
-
diff --git a/saga-2.1.2-poly.patch b/saga-2.1.2-poly.patch
new file mode 100644
index 0000000..15e431f
--- /dev/null
+++ b/saga-2.1.2-poly.patch
@@ -0,0 +1,1195 @@
+diff -Nur saga-2.1.2-fedora/src/saga_core/saga_api/Makefile.am saga-2.1.2-fedora-poly/src/saga_core/saga_api/Makefile.am
+--- saga-2.1.2-fedora/src/saga_core/saga_api/Makefile.am 2014-05-09 12:24:46.000000000 +0200
++++ saga-2.1.2-fedora-poly/src/saga_core/saga_api/Makefile.am 2014-05-15 23:40:34.449539822 +0200
+@@ -8,11 +8,11 @@
+ SAGAPYTHONFLAGS= -D_SAGA_PYTHON
+ endif
+ if SAGA_UNICODE
+-AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=yes --cxxflags` -D_SAGA_LINUX -D_SAGA_UNICODE -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS $(DISABLELIBHARU) $(DBGFLAGS) $(SAGAPYTHONFLAGS) $(GOMPFLAGS)
+-AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=yes --libs` $(HARU_LIB) $(SAGAPYTHONFLAGS)
++AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=yes --cxxflags` -D_SAGA_LINUX -D_SAGA_UNICODE -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS $(DISABLELIBHARU) $(DBGFLAGS) $(SAGAPYTHONFLAGS) $(GOMPFLAGS) -I$(includedir)/polyclipping
++AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=yes --libs` $(HARU_LIB) $(SAGAPYTHONFLAGS) -lpolyclipping
+ else
+-AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=no --cxxflags` -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS $(DISABLELIBHARU) $(DBGFLAGS) $(GOMPFLAGS)
+-AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=no --libs` $(HARU_LIB)
++AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=no --cxxflags` -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS $(DISABLELIBHARU) $(DBGFLAGS) $(GOMPFLAGS) -I$(includedir)/polyclipping
++AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=no --libs` $(HARU_LIB) -lpolyclipping
+ endif
+ libsaga_api_la_LDFLAGS =$(AM_LDFLAGS) -release $(VERSION)
+
+@@ -47,7 +47,6 @@
+ api_memory.cpp\
+ api_string.cpp\
+ api_translator.cpp\
+-clipper.cpp\
+ data_manager.cpp\
+ dataobject.cpp\
+ geo_classes.cpp\
+diff -Nur saga-2.1.2-fedora/src/saga_core/saga_api/Makefile.am.orig saga-2.1.2-fedora-poly/src/saga_core/saga_api/Makefile.am.orig
+--- saga-2.1.2-fedora/src/saga_core/saga_api/Makefile.am.orig 1970-01-01 01:00:00.000000000 +0100
++++ saga-2.1.2-fedora-poly/src/saga_core/saga_api/Makefile.am.orig 2014-05-09 12:24:46.000000000 +0200
+@@ -0,0 +1,145 @@
++#
++# $Id: Makefile.am 2034 2014-03-03 15:35:14Z manfred-e $
++#
++if DEBUG
++DBGFLAGS = -g -DDEBUG
++endif
++if SAGA_PYTHON
++SAGAPYTHONFLAGS= -D_SAGA_PYTHON
++endif
++if SAGA_UNICODE
++AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=yes --cxxflags` -D_SAGA_LINUX -D_SAGA_UNICODE -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS $(DISABLELIBHARU) $(DBGFLAGS) $(SAGAPYTHONFLAGS) $(GOMPFLAGS)
++AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=yes --libs` $(HARU_LIB) $(SAGAPYTHONFLAGS)
++else
++AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=no --cxxflags` -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS $(DISABLELIBHARU) $(DBGFLAGS) $(GOMPFLAGS)
++AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=no --libs` $(HARU_LIB)
++endif
++libsaga_api_la_LDFLAGS =$(AM_LDFLAGS) -release $(VERSION)
++
++lib_LTLIBRARIES = libsaga_api.la
++
++otherincludedir = $(pkgincludedir)/saga_core/saga_api
++otherinclude_HEADERS = api_core.h \
++compatibility.h \
++data_manager.h \
++dataobject.h \
++geo_tools.h \
++grid.h \
++grid_pyramid.h \
++mat_tools.h \
++metadata.h \
++module.h \
++module_library.h \
++parameters.h \
++pointcloud.h \
++saga_api.h \
++shapes.h \
++table_dbase.h \
++table.h \
++table_value.h \
++tin.h
++
++libsaga_api_la_SOURCES =\
++api_callback.cpp\
++api_colors.cpp\
++api_core.cpp\
++api_file.cpp\
++api_memory.cpp\
++api_string.cpp\
++api_translator.cpp\
++clipper.cpp\
++data_manager.cpp\
++dataobject.cpp\
++geo_classes.cpp\
++geo_functions.cpp\
++grid.cpp\
++grid_io.cpp\
++grid_memory.cpp\
++grid_operation.cpp\
++grid_pyramid.cpp\
++grid_system.cpp\
++mat_formula.cpp\
++mat_grid_radius.cpp\
++mat_indexing.cpp\
++mat_matrix.cpp\
++mat_regression.cpp\
++mat_regression_multiple.cpp\
++mat_spline.cpp\
++mat_tools.cpp\
++mat_trend.cpp\
++metadata.cpp\
++module.cpp\
++module_grid.cpp\
++module_grid_interactive.cpp\
++module_interactive.cpp\
++module_interactive_base.cpp\
++module_library.cpp\
++module_library_interface.cpp\
++parameter.cpp\
++parameter_data.cpp\
++parameters.cpp\
++pointcloud.cpp\
++projections.cpp\
++quadtree.cpp\
++saga_api.cpp\
++shape.cpp\
++shape_line.cpp\
++shape_part.cpp\
++shape_point.cpp\
++shape_points.cpp\
++shape_polygon.cpp\
++shapes.cpp\
++shapes_io.cpp\
++shapes_ogis.cpp\
++shapes_polygons.cpp\
++shapes_search.cpp\
++shapes_selection.cpp\
++table.cpp\
++table_dbase.cpp\
++table_io.cpp\
++table_record.cpp\
++table_selection.cpp\
++tin.cpp\
++tin_elements.cpp\
++tin_triangulation.cpp\
++api_core.h\
++clipper.hpp\
++data_manager.h\
++dataobject.h\
++geo_tools.h\
++grid.h\
++grid_pyramid.h\
++mat_tools.h\
++metadata.h\
++module.h\
++module_library.h\
++parameters.h\
++pointcloud.h\
++saga_api.h\
++shapes.h\
++table.h\
++table_dbase.h\
++table_value.h\
++tin.h
++
++install-exec-hook:
++ -ldconfig
++
++if SAGA_UNICODE
++SWIGUNICODEFLAGS = -D_SWIG_WCHAR -D_SAGA_UNICODE
++endif
++
++if SAGA_PYTHON
++_saga_api_la_CPPFLAGS = $(PYTHON_CPPFLAGS) $(SWIGUNICODEFLAGS) $(DISABLELIBHARU)
++_saga_api_la_LDFLAGS = -module -release $(VERSION) $(SWIG_LIB)
++nodist__saga_api_la_SOURCES = saga_api_wrap.cxx
++_saga_api_la_LIBADD = libsaga_api.la
++
++pyexec_LTLIBRARIES = _saga_api.la
++nodist_pyexec_PYTHON = saga_api.py
++
++saga_api_wrap.cxx:
++ $(SWIG) -includeall -python $(SWIGUNICODEFLAGS) $(DISABLELIBHARU) $(SAGAPYTHONFLAGS) ./saga_api.h
++endif
++
++CLEANFILES = saga_api_wrap.cxx
+diff -Nur saga-2.1.2-fedora/src/saga_core/saga_api/Makefile.in saga-2.1.2-fedora-poly/src/saga_core/saga_api/Makefile.in
+--- saga-2.1.2-fedora/src/saga_core/saga_api/Makefile.in 2014-05-09 12:25:43.000000000 +0200
++++ saga-2.1.2-fedora-poly/src/saga_core/saga_api/Makefile.in 2014-05-15 23:40:34.449539822 +0200
+@@ -111,7 +111,7 @@
+ libsaga_api_la_LIBADD =
+ am_libsaga_api_la_OBJECTS = api_callback.lo api_colors.lo api_core.lo \
+ api_file.lo api_memory.lo api_string.lo api_translator.lo \
+- clipper.lo data_manager.lo dataobject.lo geo_classes.lo \
++ data_manager.lo dataobject.lo geo_classes.lo \
+ geo_functions.lo grid.lo grid_io.lo grid_memory.lo \
+ grid_operation.lo grid_pyramid.lo grid_system.lo \
+ mat_formula.lo mat_grid_radius.lo mat_indexing.lo \
+@@ -353,7 +353,6 @@
+ api_memory.cpp\
+ api_string.cpp\
+ api_translator.cpp\
+-clipper.cpp\
+ data_manager.cpp\
+ dataobject.cpp\
+ geo_classes.cpp\
+@@ -409,7 +408,6 @@
+ tin_elements.cpp\
+ tin_triangulation.cpp\
+ api_core.h\
+-clipper.hpp\
+ data_manager.h\
+ dataobject.h\
+ geo_tools.h\
+@@ -557,7 +555,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/api_memory.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/api_string.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/api_translator.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/clipper.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/data_manager.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dataobject.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/geo_classes.Plo at am__quote@
+diff -Nur saga-2.1.2-fedora/src/saga_core/saga_api/Makefile.in.orig saga-2.1.2-fedora-poly/src/saga_core/saga_api/Makefile.in.orig
+--- saga-2.1.2-fedora/src/saga_core/saga_api/Makefile.in.orig 1970-01-01 01:00:00.000000000 +0100
++++ saga-2.1.2-fedora-poly/src/saga_core/saga_api/Makefile.in.orig 2014-05-09 12:25:43.000000000 +0200
+@@ -0,0 +1,967 @@
++# Makefile.in generated by automake 1.12.1 from Makefile.am.
++# @configure_input@
++
++# Copyright (C) 1994-2012 Free Software Foundation, Inc.
++
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++ at SET_MAKE@
++
++
++VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
++pkgdatadir = $(datadir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++subdir = src/saga_core/saga_api
++DIST_COMMON = $(otherinclude_HEADERS) $(srcdir)/Makefile.am \
++ $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
++ $(top_srcdir)/py-compile
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \
++ $(top_srcdir)/m4/ax_pkg_swig.m4 \
++ $(top_srcdir)/m4/ax_python_devel.m4 \
++ $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \
++ $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++ $(top_srcdir)/configure.ac
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(install_sh) -d
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++CONFIG_CLEAN_VPATH_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++ *) f=$$p;; \
++ esac;
++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
++am__install_max = 40
++am__nobase_strip_setup = \
++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
++am__nobase_strip = \
++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
++am__nobase_list = $(am__nobase_strip_setup); \
++ for p in $$list; do echo "$$p $$p"; done | \
++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
++ if (++n[$$2] == $(am__install_max)) \
++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
++ END { for (dir in files) print dir, files[dir] }'
++am__base_list = \
++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pyexecdir)" \
++ "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(otherincludedir)"
++LTLIBRARIES = $(lib_LTLIBRARIES) $(pyexec_LTLIBRARIES)
++ at SAGA_PYTHON_TRUE@_saga_api_la_DEPENDENCIES = libsaga_api.la
++ at SAGA_PYTHON_TRUE@nodist__saga_api_la_OBJECTS = \
++ at SAGA_PYTHON_TRUE@ _saga_api_la-saga_api_wrap.lo
++_saga_api_la_OBJECTS = $(nodist__saga_api_la_OBJECTS)
++_saga_api_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++ $(CXXFLAGS) $(_saga_api_la_LDFLAGS) $(LDFLAGS) -o $@
++ at SAGA_PYTHON_TRUE@am__saga_api_la_rpath = -rpath $(pyexecdir)
++libsaga_api_la_LIBADD =
++am_libsaga_api_la_OBJECTS = api_callback.lo api_colors.lo api_core.lo \
++ api_file.lo api_memory.lo api_string.lo api_translator.lo \
++ clipper.lo data_manager.lo dataobject.lo geo_classes.lo \
++ geo_functions.lo grid.lo grid_io.lo grid_memory.lo \
++ grid_operation.lo grid_pyramid.lo grid_system.lo \
++ mat_formula.lo mat_grid_radius.lo mat_indexing.lo \
++ mat_matrix.lo mat_regression.lo mat_regression_multiple.lo \
++ mat_spline.lo mat_tools.lo mat_trend.lo metadata.lo module.lo \
++ module_grid.lo module_grid_interactive.lo \
++ module_interactive.lo module_interactive_base.lo \
++ module_library.lo module_library_interface.lo parameter.lo \
++ parameter_data.lo parameters.lo pointcloud.lo projections.lo \
++ quadtree.lo saga_api.lo shape.lo shape_line.lo shape_part.lo \
++ shape_point.lo shape_points.lo shape_polygon.lo shapes.lo \
++ shapes_io.lo shapes_ogis.lo shapes_polygons.lo \
++ shapes_search.lo shapes_selection.lo table.lo table_dbase.lo \
++ table_io.lo table_record.lo table_selection.lo tin.lo \
++ tin_elements.lo tin_triangulation.lo
++libsaga_api_la_OBJECTS = $(am_libsaga_api_la_OBJECTS)
++libsaga_api_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++ $(CXXFLAGS) $(libsaga_api_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++am__mv = mv -f
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++CXXLD = $(CXX)
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
++SOURCES = $(nodist__saga_api_la_SOURCES) $(libsaga_api_la_SOURCES)
++DIST_SOURCES = $(libsaga_api_la_SOURCES)
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
++am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile)
++py_compile = $(top_srcdir)/py-compile
++HEADERS = $(otherinclude_HEADERS)
++ETAGS = etags
++CTAGS = ctags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++ACLOCAL = @ACLOCAL@
++AMTAR = @AMTAR@
++AR = @AR@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@
++AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++DISABLELIBHARU = @DISABLELIBHARU@
++DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
++DUMPBIN = @DUMPBIN@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++EXEEXT = @EXEEXT@
++FGREP = @FGREP@
++GOMPFLAGS = @GOMPFLAGS@
++GREP = @GREP@
++HARU_LIB = @HARU_LIB@
++INSTALL = @INSTALL@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LD = @LD@
++LDFLAGS = @LDFLAGS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
++LIBTOOL = @LIBTOOL@
++LIPO = @LIPO@
++LN_S = @LN_S@
++LOCAL_INCS = @LOCAL_INCS@
++LOCAL_LIBS = @LOCAL_LIBS@
++LTLIBOBJS = @LTLIBOBJS@
++MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
++MKDIR_P = @MKDIR_P@
++NM = @NM@
++NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++OTOOL = @OTOOL@
++OTOOL64 = @OTOOL64@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PG_CONFIG = @PG_CONFIG@
++POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@
++POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
++POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
++POW_LIB = @POW_LIB@
++PYTHON = @PYTHON@
++PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
++PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
++PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
++PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
++PYTHON_PLATFORM = @PYTHON_PLATFORM@
++PYTHON_PREFIX = @PYTHON_PREFIX@
++PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
++PYTHON_VERSION = @PYTHON_VERSION@
++RANLIB = @RANLIB@
++SED = @SED@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++STRIP = @STRIP@
++SWIG = @SWIG@
++SWIG_LIB = @SWIG_LIB@
++VERSION = @VERSION@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++builddir = @builddir@
++datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++htmldir = @htmldir@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localedir = @localedir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
++pkgpyexecdir = @pkgpyexecdir@
++pkgpythondir = @pkgpythondir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++psdir = @psdir@
++pyexecdir = @pyexecdir@
++pythondir = @pythondir@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
++
++#
++# $Id: Makefile.am 2034 2014-03-03 15:35:14Z manfred-e $
++#
++ at DEBUG_TRUE@DBGFLAGS = -g -DDEBUG
++ at SAGA_PYTHON_TRUE@SAGAPYTHONFLAGS = -D_SAGA_PYTHON
++ at SAGA_UNICODE_FALSE@AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=no --cxxflags` -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS $(DISABLELIBHARU) $(DBGFLAGS) $(GOMPFLAGS)
++ at SAGA_UNICODE_TRUE@AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=yes --cxxflags` -D_SAGA_LINUX -D_SAGA_UNICODE -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS $(DISABLELIBHARU) $(DBGFLAGS) $(SAGAPYTHONFLAGS) $(GOMPFLAGS)
++ at SAGA_UNICODE_FALSE@AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=no --libs` $(HARU_LIB)
++ at SAGA_UNICODE_TRUE@AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=yes --libs` $(HARU_LIB) $(SAGAPYTHONFLAGS)
++libsaga_api_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION)
++lib_LTLIBRARIES = libsaga_api.la
++otherincludedir = $(pkgincludedir)/saga_core/saga_api
++otherinclude_HEADERS = api_core.h \
++compatibility.h \
++data_manager.h \
++dataobject.h \
++geo_tools.h \
++grid.h \
++grid_pyramid.h \
++mat_tools.h \
++metadata.h \
++module.h \
++module_library.h \
++parameters.h \
++pointcloud.h \
++saga_api.h \
++shapes.h \
++table_dbase.h \
++table.h \
++table_value.h \
++tin.h
++
++libsaga_api_la_SOURCES = \
++api_callback.cpp\
++api_colors.cpp\
++api_core.cpp\
++api_file.cpp\
++api_memory.cpp\
++api_string.cpp\
++api_translator.cpp\
++clipper.cpp\
++data_manager.cpp\
++dataobject.cpp\
++geo_classes.cpp\
++geo_functions.cpp\
++grid.cpp\
++grid_io.cpp\
++grid_memory.cpp\
++grid_operation.cpp\
++grid_pyramid.cpp\
++grid_system.cpp\
++mat_formula.cpp\
++mat_grid_radius.cpp\
++mat_indexing.cpp\
++mat_matrix.cpp\
++mat_regression.cpp\
++mat_regression_multiple.cpp\
++mat_spline.cpp\
++mat_tools.cpp\
++mat_trend.cpp\
++metadata.cpp\
++module.cpp\
++module_grid.cpp\
++module_grid_interactive.cpp\
++module_interactive.cpp\
++module_interactive_base.cpp\
++module_library.cpp\
++module_library_interface.cpp\
++parameter.cpp\
++parameter_data.cpp\
++parameters.cpp\
++pointcloud.cpp\
++projections.cpp\
++quadtree.cpp\
++saga_api.cpp\
++shape.cpp\
++shape_line.cpp\
++shape_part.cpp\
++shape_point.cpp\
++shape_points.cpp\
++shape_polygon.cpp\
++shapes.cpp\
++shapes_io.cpp\
++shapes_ogis.cpp\
++shapes_polygons.cpp\
++shapes_search.cpp\
++shapes_selection.cpp\
++table.cpp\
++table_dbase.cpp\
++table_io.cpp\
++table_record.cpp\
++table_selection.cpp\
++tin.cpp\
++tin_elements.cpp\
++tin_triangulation.cpp\
++api_core.h\
++clipper.hpp\
++data_manager.h\
++dataobject.h\
++geo_tools.h\
++grid.h\
++grid_pyramid.h\
++mat_tools.h\
++metadata.h\
++module.h\
++module_library.h\
++parameters.h\
++pointcloud.h\
++saga_api.h\
++shapes.h\
++table.h\
++table_dbase.h\
++table_value.h\
++tin.h
++
++ at SAGA_UNICODE_TRUE@SWIGUNICODEFLAGS = -D_SWIG_WCHAR -D_SAGA_UNICODE
++ at SAGA_PYTHON_TRUE@_saga_api_la_CPPFLAGS = $(PYTHON_CPPFLAGS) $(SWIGUNICODEFLAGS) $(DISABLELIBHARU)
++ at SAGA_PYTHON_TRUE@_saga_api_la_LDFLAGS = -module -release $(VERSION) $(SWIG_LIB)
++ at SAGA_PYTHON_TRUE@nodist__saga_api_la_SOURCES = saga_api_wrap.cxx
++ at SAGA_PYTHON_TRUE@_saga_api_la_LIBADD = libsaga_api.la
++ at SAGA_PYTHON_TRUE@pyexec_LTLIBRARIES = _saga_api.la
++ at SAGA_PYTHON_TRUE@nodist_pyexec_PYTHON = saga_api.py
++CLEANFILES = saga_api_wrap.cxx
++all: all-am
++
++.SUFFIXES:
++.SUFFIXES: .cpp .cxx .lo .o .obj
++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++ @for dep in $?; do \
++ case '$(am__configure_deps)' in \
++ *$$dep*) \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
++ exit 1;; \
++ esac; \
++ done; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/saga_core/saga_api/Makefile'; \
++ $(am__cd) $(top_srcdir) && \
++ $(AUTOMAKE) --foreign src/saga_core/saga_api/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++ @case '$?' in \
++ *config.status*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++ *) \
++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++ esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: $(am__configure_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(am__aclocal_m4_deps):
++install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++ @$(NORMAL_INSTALL)
++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
++ list2=; for p in $$list; do \
++ if test -f $$p; then \
++ list2="$$list2 $$p"; \
++ else :; fi; \
++ done; \
++ test -z "$$list2" || { \
++ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
++ }
++
++uninstall-libLTLIBRARIES:
++ @$(NORMAL_UNINSTALL)
++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
++ for p in $$list; do \
++ $(am__strip_dir) \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
++ done
++
++clean-libLTLIBRARIES:
++ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
++ @list='$(lib_LTLIBRARIES)'; \
++ locs=`for p in $$list; do echo $$p; done | \
++ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
++ sort -u`; \
++ test -z "$$locs" || { \
++ echo rm -f $${locs}; \
++ rm -f $${locs}; \
++ }
++install-pyexecLTLIBRARIES: $(pyexec_LTLIBRARIES)
++ @$(NORMAL_INSTALL)
++ @list='$(pyexec_LTLIBRARIES)'; test -n "$(pyexecdir)" || list=; \
++ list2=; for p in $$list; do \
++ if test -f $$p; then \
++ list2="$$list2 $$p"; \
++ else :; fi; \
++ done; \
++ test -z "$$list2" || { \
++ echo " $(MKDIR_P) '$(DESTDIR)$(pyexecdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(pyexecdir)" || exit 1; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pyexecdir)'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pyexecdir)"; \
++ }
++
++uninstall-pyexecLTLIBRARIES:
++ @$(NORMAL_UNINSTALL)
++ @list='$(pyexec_LTLIBRARIES)'; test -n "$(pyexecdir)" || list=; \
++ for p in $$list; do \
++ $(am__strip_dir) \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pyexecdir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pyexecdir)/$$f"; \
++ done
++
++clean-pyexecLTLIBRARIES:
++ -test -z "$(pyexec_LTLIBRARIES)" || rm -f $(pyexec_LTLIBRARIES)
++ @list='$(pyexec_LTLIBRARIES)'; \
++ locs=`for p in $$list; do echo $$p; done | \
++ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
++ sort -u`; \
++ test -z "$$locs" || { \
++ echo rm -f $${locs}; \
++ rm -f $${locs}; \
++ }
++_saga_api.la: $(_saga_api_la_OBJECTS) $(_saga_api_la_DEPENDENCIES) $(EXTRA__saga_api_la_DEPENDENCIES)
++ $(_saga_api_la_LINK) $(am__saga_api_la_rpath) $(_saga_api_la_OBJECTS) $(_saga_api_la_LIBADD) $(LIBS)
++libsaga_api.la: $(libsaga_api_la_OBJECTS) $(libsaga_api_la_DEPENDENCIES) $(EXTRA_libsaga_api_la_DEPENDENCIES)
++ $(libsaga_api_la_LINK) -rpath $(libdir) $(libsaga_api_la_OBJECTS) $(libsaga_api_la_LIBADD) $(LIBS)
++
++mostlyclean-compile:
++ -rm -f *.$(OBJEXT)
++
++distclean-compile:
++ -rm -f *.tab.c
++
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/_saga_api_la-saga_api_wrap.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/api_callback.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/api_colors.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/api_core.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/api_file.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/api_memory.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/api_string.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/api_translator.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/clipper.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/data_manager.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dataobject.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/geo_classes.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/geo_functions.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/grid.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/grid_io.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/grid_memory.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/grid_operation.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/grid_pyramid.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/grid_system.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mat_formula.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mat_grid_radius.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mat_indexing.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mat_matrix.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mat_regression.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mat_regression_multiple.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mat_spline.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mat_tools.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mat_trend.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/metadata.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/module.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/module_grid.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/module_grid_interactive.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/module_interactive.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/module_interactive_base.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/module_library.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/module_library_interface.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/parameter.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/parameter_data.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/parameters.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pointcloud.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/projections.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/quadtree.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/saga_api.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shape.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shape_line.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shape_part.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shape_point.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shape_points.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shape_polygon.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shapes.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shapes_io.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shapes_ogis.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shapes_polygons.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shapes_search.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shapes_selection.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/table.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/table_dbase.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/table_io.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/table_record.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/table_selection.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tin.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tin_elements.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tin_triangulation.Plo at am__quote@
++
++.cpp.o:
++ at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
++
++.cpp.obj:
++ at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
++
++.cpp.lo:
++ at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
++
++_saga_api_la-saga_api_wrap.lo: saga_api_wrap.cxx
++ at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_saga_api_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT _saga_api_la-saga_api_wrap.lo -MD -MP -MF $(DEPDIR)/_saga_api_la-saga_api_wrap.Tpo -c -o _saga_api_la-saga_api_wrap.lo `test -f 'saga_api_wrap.cxx' || echo '$(srcdir)/'`saga_api_wrap.cxx
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_saga_api_la-saga_api_wrap.Tpo $(DEPDIR)/_saga_api_la-saga_api_wrap.Plo
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='saga_api_wrap.cxx' object='_saga_api_la-saga_api_wrap.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_saga_api_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o _saga_api_la-saga_api_wrap.lo `test -f 'saga_api_wrap.cxx' || echo '$(srcdir)/'`saga_api_wrap.cxx
++
++.cxx.o:
++ at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
++
++.cxx.obj:
++ at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
++
++.cxx.lo:
++ at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
++
++mostlyclean-libtool:
++ -rm -f *.lo
++
++clean-libtool:
++ -rm -rf .libs _libs
++install-nodist_pyexecPYTHON: $(nodist_pyexec_PYTHON)
++ @$(NORMAL_INSTALL)
++ @list='$(nodist_pyexec_PYTHON)'; dlist=; list2=; test -n "$(pyexecdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(pyexecdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(pyexecdir)" || exit 1; \
++ fi; \
++ for p in $$list; do \
++ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
++ if test -f $$b$$p; then \
++ $(am__strip_dir) \
++ dlist="$$dlist $$f"; \
++ list2="$$list2 $$b$$p"; \
++ else :; fi; \
++ done; \
++ for file in $$list2; do echo $$file; done | $(am__base_list) | \
++ while read files; do \
++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pyexecdir)'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(pyexecdir)" || exit $$?; \
++ done || exit $$?; \
++ if test -n "$$dlist"; then \
++ $(am__py_compile) --destdir "$(DESTDIR)" \
++ --basedir "$(pyexecdir)" $$dlist; \
++ else :; fi
++
++uninstall-nodist_pyexecPYTHON:
++ @$(NORMAL_UNINSTALL)
++ @list='$(nodist_pyexec_PYTHON)'; test -n "$(pyexecdir)" || list=; \
++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++ test -n "$$files" || exit 0; \
++ dir='$(DESTDIR)$(pyexecdir)'; \
++ filesc=`echo "$$files" | sed 's|$$|c|'`; \
++ fileso=`echo "$$files" | sed 's|$$|o|'`; \
++ st=0; \
++ for files in "$$files" "$$filesc" "$$fileso"; do \
++ $(am__uninstall_files_from_dir) || st=$$?; \
++ done; \
++ exit $$st
++install-otherincludeHEADERS: $(otherinclude_HEADERS)
++ @$(NORMAL_INSTALL)
++ @list='$(otherinclude_HEADERS)'; test -n "$(otherincludedir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(otherincludedir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(otherincludedir)" || exit 1; \
++ fi; \
++ for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; \
++ done | $(am__base_list) | \
++ while read files; do \
++ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(otherincludedir)'"; \
++ $(INSTALL_HEADER) $$files "$(DESTDIR)$(otherincludedir)" || exit $$?; \
++ done
++
++uninstall-otherincludeHEADERS:
++ @$(NORMAL_UNINSTALL)
++ @list='$(otherinclude_HEADERS)'; test -n "$(otherincludedir)" || list=; \
++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++ dir='$(DESTDIR)$(otherincludedir)'; $(am__uninstall_files_from_dir)
++
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ mkid -fID $$unique
++tags: TAGS
++
++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
++ set x; \
++ here=`pwd`; \
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ shift; \
++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
++ test -n "$$unique" || unique=$$empty_fix; \
++ if test $$# -gt 0; then \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ "$$@" $$unique; \
++ else \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$unique; \
++ fi; \
++ fi
++ctags: CTAGS
++CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ test -z "$(CTAGS_ARGS)$$unique" \
++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ $$unique
++
++GTAGS:
++ here=`$(am__cd) $(top_builddir) && pwd` \
++ && $(am__cd) $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) "$$here"
++
++cscopelist: $(HEADERS) $(SOURCES) $(LISP)
++ list='$(SOURCES) $(HEADERS) $(LISP)'; \
++ case "$(srcdir)" in \
++ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
++ *) sdir=$(subdir)/$(srcdir) ;; \
++ esac; \
++ for i in $$list; do \
++ if test -f "$$i"; then \
++ echo "$(subdir)/$$i"; \
++ else \
++ echo "$$sdir/$$i"; \
++ fi; \
++ done >> $(top_builddir)/cscope.files
++
++distclean-tags:
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++
++distdir: $(DISTFILES)
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test -d "$(distdir)/$$file"; then \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++ fi; \
++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++ fi; \
++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
++ else \
++ test -f "$(distdir)/$$file" \
++ || cp -p $$d/$$file "$(distdir)/$$file" \
++ || exit 1; \
++ fi; \
++ done
++check-am: all-am
++check: check-am
++all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++installdirs:
++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(otherincludedir)"; do \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ done
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
++mostlyclean-generic:
++
++clean-generic:
++ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
++
++distclean-generic:
++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
++
++maintainer-clean-generic:
++ @echo "This command is intended for maintainers to use"
++ @echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
++
++clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
++ clean-pyexecLTLIBRARIES mostlyclean-am
++
++distclean: distclean-am
++ -rm -rf ./$(DEPDIR)
++ -rm -f Makefile
++distclean-am: clean-am distclean-compile distclean-generic \
++ distclean-tags
++
++dvi: dvi-am
++
++dvi-am:
++
++html: html-am
++
++html-am:
++
++info: info-am
++
++info-am:
++
++install-data-am: install-otherincludeHEADERS
++
++install-dvi: install-dvi-am
++
++install-dvi-am:
++
++install-exec-am: install-libLTLIBRARIES install-nodist_pyexecPYTHON \
++ install-pyexecLTLIBRARIES
++ @$(NORMAL_INSTALL)
++ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
++install-html: install-html-am
++
++install-html-am:
++
++install-info: install-info-am
++
++install-info-am:
++
++install-man:
++
++install-pdf: install-pdf-am
++
++install-pdf-am:
++
++install-ps: install-ps-am
++
++install-ps-am:
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++ -rm -rf ./$(DEPDIR)
++ -rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-libLTLIBRARIES uninstall-nodist_pyexecPYTHON \
++ uninstall-otherincludeHEADERS uninstall-pyexecLTLIBRARIES
++
++.MAKE: install-am install-exec-am install-strip
++
++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool clean-pyexecLTLIBRARIES \
++ cscopelist ctags distclean distclean-compile distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am html \
++ html-am info info-am install install-am install-data \
++ install-data-am install-dvi install-dvi-am install-exec \
++ install-exec-am install-exec-hook install-html install-html-am \
++ install-info install-info-am install-libLTLIBRARIES \
++ install-man install-nodist_pyexecPYTHON \
++ install-otherincludeHEADERS install-pdf install-pdf-am \
++ install-ps install-ps-am install-pyexecLTLIBRARIES \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-libLTLIBRARIES uninstall-nodist_pyexecPYTHON \
++ uninstall-otherincludeHEADERS uninstall-pyexecLTLIBRARIES
++
++
++install-exec-hook:
++ -ldconfig
++
++ at SAGA_PYTHON_TRUE@saga_api_wrap.cxx:
++ at SAGA_PYTHON_TRUE@ $(SWIG) -includeall -python $(SWIGUNICODEFLAGS) $(DISABLELIBHARU) $(SAGAPYTHONFLAGS) ./saga_api.h
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+diff -Nur saga-2.1.2-fedora/src/saga_core/saga_gui/dlg_about.cpp saga-2.1.2-fedora-poly/src/saga_core/saga_gui/dlg_about.cpp
+--- saga-2.1.2-fedora/src/saga_core/saga_gui/dlg_about.cpp 2014-05-09 12:24:44.000000000 +0200
++++ saga-2.1.2-fedora-poly/src/saga_core/saga_gui/dlg_about.cpp 2014-05-15 23:55:33.672005665 +0200
+@@ -62,7 +62,7 @@
+
+ //---------------------------------------------------------
+ #include <saga_api/saga_api.h>
+-#include <saga_api/clipper.hpp>
++#include <polyclipping/clipper.hpp>
+
+ #include <wx/notebook.h>
+
diff --git a/saga-2.1.2-remove-references-to-libfire.patch b/saga-2.1.2-remove-references-to-libfire.patch
new file mode 100644
index 0000000..401f10a
--- /dev/null
+++ b/saga-2.1.2-remove-references-to-libfire.patch
@@ -0,0 +1,17 @@
+diff -Nur saga-2.1.2-fedora/configure.ac saga-2.1.2-fedora-fire/configure.ac
+--- saga-2.1.2-fedora/configure.ac 2014-05-09 12:24:43.000000000 +0200
++++ saga-2.1.2-fedora-fire/configure.ac 2014-05-15 22:49:27.160028180 +0200
+@@ -276,7 +276,6 @@
+ src/modules/simulation/sim_cellular_automata/Makefile \
+ src/modules/simulation/sim_ecosystems_hugget/Makefile \
+ src/modules/simulation/sim_erosion/Makefile \
+- src/modules/simulation/sim_fire_spreading/Makefile \
+ src/modules/simulation/sim_hydrology/Makefile \
+ src/modules/simulation/sim_ihacres/Makefile \
+ src/modules/statistics/Makefile \
+diff -Nur saga-2.1.2-fedora/src/modules/simulation/Makefile.am saga-2.1.2-fedora-fire/src/modules/simulation/Makefile.am
+--- saga-2.1.2-fedora/src/modules/simulation/Makefile.am 2014-05-09 12:24:47.000000000 +0200
++++ saga-2.1.2-fedora-fire/src/modules/simulation/Makefile.am 2014-05-15 22:49:53.076149197 +0200
+@@ -1 +1 @@
+-SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_fire_spreading sim_hydrology sim_ihacres
++SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_hydrology sim_ihacres
diff --git a/saga-2.1.2-use-system-version-of-grib2.patch b/saga-2.1.2-use-system-version-of-grib2.patch
new file mode 100644
index 0000000..6649f6b
--- /dev/null
+++ b/saga-2.1.2-use-system-version-of-grib2.patch
@@ -0,0 +1,12 @@
+diff -Nur saga-2.1.2-fedora/src/modules/io/io_grid_grib2/grib2_import.h saga-2.1.2-fedora-grib/src/modules/io/io_grid_grib2/grib2_import.h
+--- saga-2.1.2-fedora/src/modules/io/io_grid_grib2/grib2_import.h 2014-05-09 12:24:51.000000000 +0200
++++ saga-2.1.2-fedora-grib/src/modules/io/io_grid_grib2/grib2_import.h 2014-05-15 22:55:58.370207079 +0200
+@@ -11,7 +11,7 @@
+
+ #include "MLB_Interface.h"
+ extern "C" {
+-#include "g2clib-1.0.4/grib2.h"
++#include <grib2.h>
+ }
+
+
diff --git a/saga.spec b/saga.spec
index 5e58de4..982edbf 100644
--- a/saga.spec
+++ b/saga.spec
@@ -1,5 +1,5 @@
Name: saga
-Version: 2.1.1
+Version: 2.1.2
Release: 1%{?dist}
Summary: Geographic information system with an API for processing geodata
@@ -27,33 +27,31 @@ Patch1: %{name}-2.1.0-adjust-grid_gridding-to-use-qhull.patch
# Firelib license does not allow commercial use
# Sources are excluded from tarball
# http://sourceforge.net/p/saga-gis/bugs/128/
-Patch2: %{name}-2.1.1-remove-references-to-libfire.patch
+Patch2: %{name}-2.1.2-remove-references-to-libfire.patch
# Link to grib2 system library
-Patch3: %{name}-2.0.8-use-system-version-of-grib2.patch
+Patch3: %{name}-2.1.2-use-system-version-of-grib2.patch
# Use Fedora's static g2clib
# http://sourceforge.net/p/saga-gis/bugs/137/
-Patch4: %{name}-2.1.0-g2clib.patch
+Patch4: %{name}-2.1.2-g2clib.patch
# Dxflib is not regarded free as of http://lists.fedoraproject.org/pipermail/legal/2011-October/001734.html
# Sources are excluded from tarball
# http://sourceforge.net/mailarchive/forum.php?thread_name=50917DA0.1090600%40ribbonsoft.com&forum_name=saga-gis-developer
# https://lists.fedoraproject.org/pipermail/legal/2012-November/002033.html
# http://sourceforge.net/p/saga-gis/bugs/135/
-Patch5: %{name}-2.1.1-dxflib.patch
+Patch5: %{name}-2.1.2-dxflib.patch
# Use system-wide e00compr
# http://sourceforge.net/p/saga-gis/bugs/137/
-Patch6: %{name}-2.1.0-e00.patch
+Patch6: %{name}-2.1.2-e00.patch
# Use system-wide polyclipping
# http://sourceforge.net/p/saga-gis/bugs/135/
-Patch7: %{name}-2.1.0-poly.patch
+Patch7: %{name}-2.1.2-poly.patch
-# Polyclipping was changed in an incompatible way
-# https://sourceforge.net/p/saga-gis/bugs/178/
-Patch8: %{name}-2.1.1-polyclipping6-api.patch
+Patch8: %{name}-2.1.2-format.patch
BuildRequires: desktop-file-utils
BuildRequires: libtool automake autoconf
@@ -115,23 +113,14 @@ rm -rf src/modules_io/esri_e00/io_esri_e00/e00compr
rm -f src/saga_core/saga_api/clipper.{c,h}pp
rm -rf src/modules/grid/grid_gridding/nn/triangle.*
-# Leftovers
-# TODO: Reported, but where does it come from?
-rm -rf src/saga_core/saga_gui/res/xpm/.svn
-
%patch1 -p1 -b .~qhull
+%patch2 -p1 -b .~libfire
%patch3 -p1 -b .~grib2
%patch4 -p1 -b .~g2clib
%patch5 -p1 -b .~dxflib
%patch6 -p1 -b .~e00
%patch7 -p1 -b .~poly
-%patch8 -p1 -b .~poly-api
-%patch2 -p1 -b .~libfire
-
-# Update FSF address
-# https://sourceforge.net/tracker/?func=detail&aid=3404676&group_id=102728&atid=632652
-find . -name "*.cpp" -exec sed -i 's/59 Temple Place[ ]*[,-] Suite 330, Boston, MA[ ]*02111-1307/51 Franklin Street, Fifth Floor, Boston, MA 02110-1301/' {} \;
-find . -name "*.h" -exec sed -i 's/59 Temple Place[ ]*[-,] Suite 330, Boston, MA[ ]*02111-1307/51 Franklin Street, Fifth Floor, Boston, MA 02110-1301/' {} \;
+%patch8 -p1 -b .~format
# Adapt to wx3 package file names
find . -name "configure*" -exec sed -i 's/wx-config/wx-config-3.0/g' {} \;
@@ -162,36 +151,16 @@ rm -rf %{buildroot}/%{_libdir}/saga/lib*.la \
rm -rf %{buildroot}/%{python_sitearch}/*.la \
%{buildroot}/%{_libdir}/*.la
-# TODO: Only validate instead of install for releases after 2.1.1
-desktop-file-install \
- --dir=%{buildroot}%{_datadir}/applications \
- src/saga_core/saga_gui/res/%{name}.desktop
-
-# Install headers
-# https://sourceforge.net/p/saga-gis/bugs/129/
-# Solved for releases after 2.1.1
-for dir in api gdi; do
- mkdir -p %{buildroot}%{_includedir}/%{name}_core/%{name}_$dir
- install -pm 0644 -t %{buildroot}%{_includedir}/%{name}_core/%{name}_$dir \
- src/%{name}_core/%{name}_$dir/*.h
-done
-
-# Install icon
-# TODO: Solved for releases after 2.1.1
-mkdir %{buildroot}%{_datadir}/pixmaps/
-install -p -m644 src/%{name}_core/%{name}_gui/res/%{name}.png \
- %{buildroot}%{_datadir}/pixmaps/%{name}.png
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%files
-# COPYING not present in 2.2 branch
-# https://sourceforge.net/p/saga-gis/bugs/179/
-# Solved for releases after 2.1.1
-%doc AUTHORS ChangeLog.gz
+%doc AUTHORS ChangeLog.gz COPYING
%{_bindir}/%{name}_cmd
%{_bindir}/%{name}_gui
-#TODO: Ask developers about soname versioning (and order!)
%{_libdir}/%{name}/
+%{_datadir}/%{name}/
+# No soname versioning is yet in place and the interfaces are not stable
%{_libdir}/lib%{name}_api-%{version}.so
%{_libdir}/lib%{name}_gdi-%{version}.so
%{_datadir}/pixmaps/%{name}.png
@@ -203,7 +172,7 @@ install -p -m644 src/%{name}_core/%{name}_gui/res/%{name}.png \
%{python_sitearch}/*.so
%files devel
-%{_includedir}/%{name}_core/
+%{_includedir}/%{name}/
%{_libdir}/lib%{name}_api.so
%{_libdir}/lib%{name}_gdi.so
@@ -212,6 +181,9 @@ install -p -m644 src/%{name}_core/%{name}_gui/res/%{name}.png \
%changelog
+* Thu May 15 2014 Volker Fröhlich <volker27 at gmx.at> - 2.1.2-1
+- New upstream release
+
* Thu Feb 13 2014 Volker Fröhlich <volker27 at gmx.at> - 2.1.1-1
- New upstream release
- Compress changelog file
diff --git a/saga_tarball.sh b/saga_tarball.sh
index 0c5295e..2d3f112 100755
--- a/saga_tarball.sh
+++ b/saga_tarball.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Volker Fröhlich, 2013
-VERSION="2.1.1"
+VERSION="2.1.2"
rm -rf saga-$VERSION-fedora
rm -rf saga-$VERSION-fedora.tar.gz
@@ -12,12 +12,11 @@ cp -pr saga-$VERSION saga-$VERSION-fedora
# Remove firelib, which is not allowed for commercial use
# http://www.fire.org/downloads/fireLib/1.0.4/doc.html#8.3
# http://sourceforge.net/tracker/?func=detail&aid=3407448&group_id=102728&atid=632652
-#TODO: Only disabled for testing
-#rm -r saga-$VERSION-fedora/src/modules_simulation/fire
+rm -r saga-$VERSION-fedora/src/modules/simulation/sim_fire_spreading
# Remove dxflib, which is not regarded free as of http://lists.fedoraproject.org/pipermail/legal/2011-October/001734.html
# See www.ribbonsoft.com/dxflib.html
-rm -r saga-$VERSION-fedora/src/modules_io/shapes/io_shapes_dxf
+rm -r saga-$VERSION-fedora/src/modules/io/io_shapes_dxf
tar cfz saga_$VERSION-fedora.tar.gz saga-$VERSION-fedora
diff --git a/sources b/sources
index 1e45809..fef5cbd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aa00f6a4d5c25d2d1f9d1dbe0c1f6720 saga_2.1.1-fedora.tar.gz
+40703190b1f08df72176a8e187c166b0 saga_2.1.2-fedora.tar.gz
More information about the scm-commits
mailing list