- up to 1.1.9

- updated DESTDIR,soname,xerces patches, removed obsolete acfix patch

Changed files:
    gdal-DESTDIR.patch -> 1.3
    gdal-acfix.patch -> 1.2
    gdal-soname.patch -> 1.2
    gdal-xerces.patch -> 1.3
    gdal.spec -> 1.6

diff --git a/gdal-DESTDIR.patch b/gdal-DESTDIR.patch
index 37c1cfe9638d5a81dfc4712e2c2f91cd40b60009..3b78075b15b90756354791d87158ebcfae7519b2 100644 (file)
--- a/gdal-DESTDIR.patch
+++ b/gdal-DESTDIR.patch
@@ -1,5 +1,5 @@
---- gdal-1.1.8/GNUmakefile.orig        Wed Mar 27 22:41:45 2002
-+++ gdal-1.1.8/GNUmakefile     Mon Jun 17 22:45:44 2002
+--- gdal-1.1.9/GNUmakefile.orig        Wed Mar 27 22:41:45 2002
++++ gdal-1.1.9/GNUmakefile     Mon Jun 17 22:45:44 2002

 @@ -114,10 +114,10 @@
  install:      lib install-actions
  
 @@ -114,10 +114,10 @@
  install:      lib install-actions
  


@@ -13,79 +13,92 @@
 +      $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
 +      $(INSTALL_DIR) $(DESTDIR)$(INST_INCLUDE)
        (cd port; $(MAKE) install)
 +      $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
 +      $(INSTALL_DIR) $(DESTDIR)$(INST_INCLUDE)
        (cd port; $(MAKE) install)

-       (cd core; $(MAKE) install)
+       (cd gcore; $(MAKE) install)

        (cd frmts; $(MAKE) install)
 @@ -126,9 +126,9 @@
  ifneq ($(PYTHON),no)
        (cd pymod; $(MAKE) install)
  endif
        (cd frmts; $(MAKE) install)
 @@ -126,9 +126,9 @@
  ifneq ($(PYTHON),no)
        (cd pymod; $(MAKE) install)
  endif

--      $(INSTALL) $(GDAL_LIB) $(INST_LIB)
-+      $(INSTALL) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)
+-      $(INSTALL_DATA) $(GDAL_LIB) $(INST_LIB)
++      $(INSTALL_DATA) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)

  ifeq ($(HAVE_LD_SHARED),yes)
  ifeq ($(HAVE_LD_SHARED),yes)

--      $(INSTALL) $(GDAL_SLIB) $(INST_LIB)
+-      $(INSTALL_DATA) $(GDAL_SLIB) $(INST_LIB)

 +      $(INSTALL) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)
  endif
 +      $(INSTALL) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)
  endif

--      for f in data/*.* ; do $(INSTALL) -m 0644 $$f $(INST_DATA) ; done
-+      for f in data/*.* ; do $(INSTALL) -m 0644 $$f $(DESTDIR)$(INST_DATA) ; done
+-      for f in data/*.* ; do $(INSTALL_DATA) $$f $(INST_DATA) ; done
++      for f in data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done

  
  

---- gdal-1.1.7/ogr/GNUmakefile.orig    Fri Mar 29 00:54:26 2002
-+++ gdal-1.1.7/ogr/GNUmakefile Mon Jun 17 22:46:38 2002
-@@ -123,16 +123,16 @@
+--- gdal-1.1.9/ogr/GNUmakefile.orig    Fri Mar 29 00:54:26 2002
++++ gdal-1.1.9/ogr/GNUmakefile Mon Jun 17 22:46:38 2002
+@@ -123,18 +123,18 @@

  
  ifeq ($(OGR_ENABLED),yes)
  
  ifeq ($(OGR_ENABLED),yes)

- install-full: ogrinfo ogr2ogr ogrtindex
+ install-full: apps

 -      $(INSTALL) ogr2ogr $(INST_BIN)
 -      $(INSTALL) ogrinfo $(INST_BIN)
 -      $(INSTALL) ogrtindex $(INST_BIN)
 -      $(INSTALL) ogr2ogr $(INST_BIN)
 -      $(INSTALL) ogrinfo $(INST_BIN)
 -      $(INSTALL) ogrtindex $(INST_BIN)

--      $(INSTALL) $(OGRFRMTS_LIB) $(INST_LIB)
+-      $(INSTALL_DATA) $(OGRFRMTS_LIB) $(INST_LIB)

 +      $(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN)
 +      $(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN)
 +      $(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN)
 +      $(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN)
 +      $(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN)
 +      $(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN)

-+      $(INSTALL) $(OGRFRMTS_LIB) $(DESTDIR)$(INST_LIB)
++      $(INSTALL_DATA) $(OGRFRMTS_LIB) $(DESTDIR)$(INST_LIB)

  else
  install-full:
  endif
  
  install:      $(OGR_LIB) install-full
  else
  install-full:
  endif
  
  install:      $(OGR_LIB) install-full

--      for f in $(INST_H_FILES) ; do $(INSTALL) $$f $(INST_INCLUDE) ; done
--      $(INSTALL) $(OGR_LIB) $(INST_LIB)
-+      for f in $(INST_H_FILES) ; do $(INSTALL) $$f $(DESTDIR)$(INST_INCLUDE) ; done
-+      $(INSTALL) $(OGR_LIB) $(DESTDIR)$(INST_LIB)
+       for f in $(INST_H_FILES) ; \
+-          do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; \
++          do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; \
+       done
+-      $(INSTALL_DATA) $(OGR_LIB) $(INST_LIB)
++      $(INSTALL_DATA) $(OGR_LIB) $(DESTDIR)$(INST_LIB)

  
  
  
  

---- gdal-1.1.7/pymod/GNUmakefile.orig  Sat Sep 15 04:51:29 2001
-+++ gdal-1.1.7/pymod/GNUmakefile       Mon Jun 17 22:48:07 2002
-@@ -30,5 +30,5 @@
+--- gdal-1.1.9/pymod/GNUmakefile.orig  2003-06-04 23:57:36.000000000 +0200
++++ gdal-1.1.9/pymod/GNUmakefile       2003-07-19 17:38:20.000000000 +0200
+@@ -30,13 +30,13 @@

  
  

- 
- install:
+ # special care is taken so that python scripts are installed as executables
+ install:      $(GDALMODULE)

 -      $(INSTALL_DIR) $(INST_PYMOD)
 -      $(INSTALL_DIR) $(INST_PYMOD)

--      for f in *.py $(GDALMODULE) ; do $(INSTALL) $$f $(INST_PYMOD) ; done
+-      $(INSTALL_DATA) $(GDALMODULE) $(INST_PYMOD)

 +      $(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD)
 +      $(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD)

-+      for f in *.py $(GDALMODULE) ; do $(INSTALL) $$f $(DESTDIR)$(INST_PYMOD) ; done
---- gdal-1.1.7/port/GNUmakefile.orig   Wed Jan 23 21:45:16 2002
-+++ gdal-1.1.7/port/GNUmakefile        Mon Jun 17 22:48:41 2002
++      $(INSTALL_DATA) $(GDALMODULE) $(DESTDIR)$(INST_PYMOD)
+       for f in *.py ; do \
+           if egrep '\#\!.*python' $$f > /dev/null ; then \
+-              $(INSTALL) $$f $(INST_PYMOD) ; \
++              $(INSTALL) $$f $(DESTDIR)$(INST_PYMOD) ; \
+           else \
+-              $(INSTALL_DATA) $$f $(INST_PYMOD) ; \
++              $(INSTALL_DATA) $$f $(DESTDIR)$(INST_PYMOD) ; \
+           fi \
+       done
+ 
+--- gdal-1.1.9/port/GNUmakefile.orig   Wed Jan 23 21:45:16 2002
++++ gdal-1.1.9/port/GNUmakefile        Mon Jun 17 22:48:41 2002

 @@ -33,8 +33,8 @@
        $(RANLIB) $(LIB)
  
  install:      $(LIB)
 @@ -33,8 +33,8 @@
        $(RANLIB) $(LIB)
  
  install:      $(LIB)

--      for f in *.h ; do $(INSTALL) $$f $(INST_INCLUDE) ; done
--      $(INSTALL) cpl.a $(INST_LIB)
-+      for f in *.h ; do $(INSTALL) $$f $(DESTDIR)$(INST_INCLUDE) ; done
-+      $(INSTALL) cpl.a $(DESTDIR)$(INST_LIB)
+-      for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
+-      $(INSTALL_DATA) cpl.a $(INST_LIB)
++      for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
++      $(INSTALL_DATA) cpl.a $(DESTDIR)$(INST_LIB)

  
  xmlreformat:  xmlreformat.o $(LIB)
  
  xmlreformat:  xmlreformat.o $(LIB)

--      $(CXX) $(CXXFLAGS) xmlreformat.o $(LIB) -o xmlreformat
-\ No newline at end of file
-+      $(CXX) $(CXXFLAGS) xmlreformat.o $(LIB) -o xmlreformat
---- gdal-1.1.7/alg/GNUmakefile.orig    Thu Mar 15 04:17:34 2001
-+++ gdal-1.1.7/alg/GNUmakefile Mon Jun 17 22:49:24 2002
-@@ -19,4 +19,4 @@
+       $(CXX) $(CXXFLAGS) xmlreformat.o $(LIB) -o xmlreformat
+--- gdal-1.1.9/alg/GNUmakefile.orig    Thu Mar 15 04:17:34 2001
++++ gdal-1.1.9/alg/GNUmakefile Mon Jun 17 22:49:24 2002
+@@ -19,7 +19,7 @@

        $(CXX) -c $(GDAL_INCLUDE) $(CXXFLAGS) $*.cpp -o $*.o
  
  install:
        $(CXX) -c $(GDAL_INCLUDE) $(CXXFLAGS) $*.cpp -o $*.o
  
  install:

--      for f in *.h ; do $(INSTALL) $$f $(INST_INCLUDE) ; done
-+      for f in *.h ; do $(INSTALL) $$f $(DESTDIR)$(INST_INCLUDE) ; done
+-      for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
++      for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
+ 
+ lib:  $(OBJ)
+ (cd .. ; $(MAKE) force-lib)

 --- gdal-1.1.7/apps/GNUmakefile.orig   Wed Nov  7 04:49:16 2001
 +++ gdal-1.1.7/apps/GNUmakefile        Mon Jun 17 22:50:06 2002
 @@ -86,6 +86,6 @@
 --- gdal-1.1.7/apps/GNUmakefile.orig   Wed Nov  7 04:49:16 2001
 +++ gdal-1.1.7/apps/GNUmakefile        Mon Jun 17 22:50:06 2002
 @@ -86,6 +86,6 @@


@@ -97,11 +110,11 @@
 +      for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
 +      $(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
  
 +      for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
 +      $(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
  

---- gdal-1.1.7/core/GNUmakefile.orig   Wed Nov 21 04:16:47 2001
-+++ gdal-1.1.7/core/GNUmakefile        Mon Jun 17 22:50:30 2002
+--- gdal-1.1.9/gcore/GNUmakefile.orig  Wed Nov 21 04:16:47 2001
++++ gdal-1.1.9/gcore/GNUmakefile       Mon Jun 17 22:50:30 2002

 @@ -26,4 +26,4 @@
        $(CXX) -c $(GDAL_INCLUDE) $(CXXFLAGS) $*.cpp -o $*.o
  
  install:
 @@ -26,4 +26,4 @@
        $(CXX) -c $(GDAL_INCLUDE) $(CXXFLAGS) $*.cpp -o $*.o
  
  install:

--      for f in *.h ; do $(INSTALL) $$f $(INST_INCLUDE) ; done
-+      for f in *.h ; do $(INSTALL) $$f $(DESTDIR)$(INST_INCLUDE) ; done
+-      for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
++      for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done

diff --git a/gdal-acfix.patch b/gdal-acfix.patch
deleted file mode 100644 (file)
index 739c547..0000000
--- a/gdal-acfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gdal-1.1.7/aclocal.m4.orig Thu Jan 17 02:40:48 2002
-+++ gdal-1.1.7/aclocal.m4      Mon Jun 17 22:24:56 2002
-@@ -395,10 +395,12 @@
-     py_makefile="`$PYTHON -c '
- import sys
- print \"%s/lib/python%s/config/Makefile\"%(sys.exec_prefix, sys.version[:3])'`"
-+    changequote([, ])
-     if test ! -f "$py_makefile"; then
-       AC_MSG_ERROR([*** Couldn't find the python config makefile.  Maybe you are
- *** missing the development portion of the python installation])
-     fi
-+    changequote(,)dnl
-     eval `sed -n \
- -e "s/^CC=[   ]*\(.*\)/am_cv_python_CC='\1'/p" \
- -e "s/^OPT=[  ]*\(.*\)/am_cv_python_OPT='\1'/p" \

diff --git a/gdal-soname.patch b/gdal-soname.patch
index 59a78762bf32e0463b8ded7cffa48c978b9a5d1b..9c6d66c14e9e123f5cb9d645b6588e3545aa68e9 100644 (file)
--- a/gdal-soname.patch
+++ b/gdal-soname.patch
@@ -1,28 +1,21 @@
---- gdal-1.1.8/GNUmakefile.orig        Sun Jan 26 12:36:20 2003
-+++ gdal-1.1.8/GNUmakefile     Sun Jan 26 13:39:08 2003
-@@ -10,7 +10,7 @@
- force-lib:    
-       $(AR) r $(GDAL_LIB) $(GDAL_OBJ)
-       $(RANLIB) $(GDAL_LIB)
--      $(LD_SHARED) $(GDAL_OBJ) $(GDAL_LIBS) $(LIBS) -o $(GDAL_SLIB)
-+      $(LD_SHARED) -Wl,-soname=libgdal.$(GDAL_VER).$(SO_EXT) $(GDAL_OBJ) $(GDAL_LIBS) $(LIBS) -o $(GDAL_SLIB)
+--- gdal-1.1.9/GDALmake.opt.in.orig    2003-06-27 21:55:06.000000000 +0200
++++ gdal-1.1.9/GDALmake.opt.in 2003-07-19 17:56:43.000000000 +0200
+@@ -80,7 +80,7 @@
+ GDAL_LIB      =       $(GDAL_ROOT)/gdal.a
+ GDAL_SLIB     =       $(GDAL_ROOT)/libgdal.$(GDAL_VER).$(SO_EXT)
+ GDAL_SLIB_LINK        =       -L$(GDAL_ROOT) -lgdal.$(GDAL_VER)
+-#GDAL_SLIB_SONAME =   -Wl,-soname,libgdal.so.$(sover)
++GDAL_SLIB_SONAME =    -Wl,-soname,libgdal.$(GDAL_VER).$(SO_EXT)

  
  

- #     If you really want proper SO files that will work in /usr/lib
- #     Try replacing the above command with something like this:
-@@ -23,7 +23,7 @@
-       $(RANLIB) $(GDAL_LIB)
- 
- $(GDAL_SLIB): $(GDAL_LIB) $(GDALA_DEP)
--      $(LD_SHARED) $(GDAL_OBJ) $(GDAL_LIBS) $(LIBS) -o $(GDAL_SLIB)
-+      $(LD_SHARED) -Wl,-soname=libgdal.$(GDAL_VER).$(SO_EXT) $(GDAL_OBJ) $(GDAL_LIBS) $(LIBS) -o $(GDAL_SLIB)
- 
- check-lib:
-       $(MAKE) $(GDAL_LIB)
+ OGR_LIB               =       $(GDAL_ROOT)/ogr/ogr.a
+ CPL_LIB               =       $(GDAL_ROOT)/port/cpl.a
+--- gdal-1.1.9/GNUmakefile.orig        2003-07-19 17:48:20.000000000 +0200
++++ gdal-1.1.9/GNUmakefile     2003-07-19 17:53:27.000000000 +0200

 @@ -143,6 +143,7 @@
 @@ -143,6 +143,7 @@

-       $(INSTALL) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)
+       $(INSTALL_DATA) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)

  ifeq ($(HAVE_LD_SHARED),yes)
        $(INSTALL) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)
 +      ln -sf $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/libgdal.so
  endif
  ifeq ($(HAVE_LD_SHARED),yes)
        $(INSTALL) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)
 +      ln -sf $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/libgdal.so
  endif

-       for f in data/*.* ; do $(INSTALL) -m 0644 $$f $(DESTDIR)$(INST_DATA) ; done
+       for f in data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done

  
  

diff --git a/gdal-xerces.patch b/gdal-xerces.patch
index 66ff43106fcee4228f75e2e1eb55d66ff61b4b46..ae342614f94f05a99bf49bfd3c32d5a144f5f48b 100644 (file)
--- a/gdal-xerces.patch
+++ b/gdal-xerces.patch
@@ -16,23 +16,3 @@
    CMD="${CXX} ${XERCES_INCLUDE} ${CPPFLAGS} -o conftest conftest.cpp $LIBS"
  
    if test -z "`$CMD 2>&1`" ; then
    CMD="${CXX} ${XERCES_INCLUDE} ${CPPFLAGS} -o conftest conftest.cpp $LIBS"
  
    if test -z "`$CMD 2>&1`" ; then

---- gdal-1.1.8/ogr/ogrsf_frmts/gml/gmlreaderp.h.orig   2003-05-16 00:27:43.000000000 +0200
-+++ gdal-1.1.8/ogr/ogrsf_frmts/gml/gmlreaderp.h        2003-05-16 00:28:30.000000000 +0200
-@@ -46,13 +46,16 @@
- 
- #include "gmlreader.h"
- 
--#include <dom/DOMString.hpp>
- #include <util/PlatformUtils.hpp>
- #include <sax2/DefaultHandler.hpp>
- #include <sax2/ContentHandler.hpp>
- #include <sax2/SAX2XMLReader.hpp>
- #include <sax2/XMLReaderFactory.hpp>
- 
-+#ifdef XERCES_CPP_NAMESPACE_USE
-+XERCES_CPP_NAMESPACE_USE
-+#endif
-+
- /************************************************************************/
- /*          XMLCh / char translation functions - trstring.cpp           */
- /************************************************************************/

diff --git a/gdal.spec b/gdal.spec
index 8d03d5bd94c2f0bf8a1642082bb93b7616cd06d5..86ef4dd43ec8f05ae8dcacb9aa8583d50550f7ea 100644 (file)
--- a/gdal.spec
+++ b/gdal.spec
@@ -6,20 +6,20 @@
 Summary:       Geospatial Data Abstraction Library
 Summary(pl):   Biblioteka abstrakcji danych dotycz±cych powierzchni Ziemi
 Name:          gdal
 Summary:       Geospatial Data Abstraction Library
 Summary(pl):   Biblioteka abstrakcji danych dotycz±cych powierzchni Ziemi
 Name:          gdal

-Version:       1.1.8
+Version:       1.1.9

 Release:       1
 License:       BSD-like
 Group:         Libraries
 Source0:       ftp://ftp.remotesensing.org/pub/gdal/%{name}-%{version}.tar.gz
 Release:       1
 License:       BSD-like
 Group:         Libraries
 Source0:       ftp://ftp.remotesensing.org/pub/gdal/%{name}-%{version}.tar.gz

-# Source0-md5: e6f02c0ba706b7387203e8b4ef03945b
-Patch0:                %{name}-acfix.patch
-Patch1:                %{name}-pgsql.patch
-Patch2:                %{name}-DESTDIR.patch
-Patch3:                %{name}-soname.patch
-Patch4:                %{name}-xerces.patch
+# Source0-md5: 2183e206affc7bf25e0d33459ccb8572
+Patch0:                %{name}-pgsql.patch
+Patch1:                %{name}-DESTDIR.patch
+Patch2:                %{name}-soname.patch
+Patch3:                %{name}-xerces.patch

 URL:           http://www.remotesensing.org/gdal/
 BuildRequires: autoconf
 BuildRequires: cfitsio-devel
 URL:           http://www.remotesensing.org/gdal/
 BuildRequires: autoconf
 BuildRequires: cfitsio-devel

+BuildRequires: doxygen

 BuildRequires: hdf-devel >= 4.0
 BuildRequires: jasper-devel
 BuildRequires: libgeotiff-devel
 BuildRequires: hdf-devel >= 4.0
 BuildRequires: jasper-devel
 BuildRequires: libgeotiff-devel


@@ -94,7 +94,6 @@ Modu
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1

-%patch4 -p1

 
 %build
 %{__autoconf}
 
 %build
 %{__autoconf}


@@ -106,10 +105,15 @@ Modu
 
 %{__make}
 
 
 %{__make}
 

+%{__make} docs
+

 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT
 

-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+
+mv -f ogr/html html/org

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -119,13 +123,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

-%doc ChangeLog NEWS html/*.{html,gif,png,css}
+%doc ChangeLog NEWS

 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/libgdal.*.so
 %{_datadir}/gdal
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/libgdal.*.so
 %{_datadir}/gdal
 
 %files devel
 %defattr(644,root,root,755)

+%doc html/*

 %attr(755,root,root) %{_libdir}/libgdal.so
 %{_includedir}/*.h
 
 %attr(755,root,root) %{_libdir}/libgdal.so
 %{_includedir}/*.h