dist-git conversion

#2781)

.gitignore

@@ -1,2 +1,2 @@
-gdal-1.5.1-fedora.tar.gz
 gdalautotest-1.5.0.tar.gz
+gdal-1.5.3-fedora.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: gdal
-# $Id$
-NAME := gdal
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

gdal-gcc43.patch

@@ -1,15 +0,0 @@
---- ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp.orig	2008-02-14 02:43:16.000000000 +0200
-+++ ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp	2008-02-14 13:21:22.000000000 +0200
-@@ -26,10 +26,11 @@
-  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-  * DEALINGS IN THE SOFTWARE.
-  ****************************************************************************/
-+#include <algorithm> // for_each, find_if
-+
- #include "ogr_geojson.h"
- #include "ogrgeojsonwriter.h"
- #include <jsonc/json.h> // JSON-C
--#include <algorithm> // for_each, find_if
- 
- /************************************************************************/
- /*                       STATIC MEMBERS DEFINITION                      */

gdal-libdap.patch

@@ -0,0 +1,24 @@
+diff -up gdal-1.5.2-fedora/frmts/dods/dodsdataset2.cpp.libdap~ gdal-1.5.2-fedora/frmts/dods/dodsdataset2.cpp
+--- gdal-1.5.2-fedora/frmts/dods/dodsdataset2.cpp.libdap~	2008-09-09 16:49:39.000000000 +0200
++++ gdal-1.5.2-fedora/frmts/dods/dodsdataset2.cpp	2008-09-09 16:50:05.000000000 +0200
+@@ -67,6 +67,8 @@ CPL_C_START
+ void GDALRegister_DODS(void);
+ CPL_C_END
+ 
++using namespace libdap ;
++
+ /** Attribute names used to encode geo-referencing information. Note that
+     these are not C++ objects to avoid problems with static global
+     constructors. 
+diff -up gdal-1.5.2-fedora/ogr/ogrsf_frmts/dods/ogr_dods.h.libdap~ gdal-1.5.2-fedora/ogr/ogrsf_frmts/dods/ogr_dods.h
+--- gdal-1.5.2-fedora/ogr/ogrsf_frmts/dods/ogr_dods.h.libdap~	2008-09-09 16:50:50.000000000 +0200
++++ gdal-1.5.2-fedora/ogr/ogrsf_frmts/dods/ogr_dods.h	2008-09-09 16:51:19.000000000 +0200
+@@ -68,6 +68,8 @@
+ #include <Error.h>
+ #include <escaping.h>
+ 
++using namespace libdap ;
++
+ /************************************************************************/
+ /*                           OGRDODSFieldDefn                           */
+ /************************************************************************/

gdal-perl510.patch

@@ -1,45 +0,0 @@
---- swig/perl/gdal_wrap.cpp.orig	2008-03-25 20:19:03.000000000 +0200
-+++ swig/perl/gdal_wrap.cpp	2008-03-25 20:19:52.000000000 +0200
-@@ -1228,8 +1228,11 @@
- /* Macros for low-level exception handling */
- #define SWIG_croak(x)    { SWIG_Error(SWIG_RuntimeError, x); SWIG_fail; }
- 
-+#ifndef XSPROTO
-+# define XSPROTO(name) void name(pTHX_ CV* cv)
-+#endif 
- 
--typedef XS(SwigPerlWrapper);
-+typedef XSPROTO(SwigPerlWrapper);
- typedef SwigPerlWrapper *SwigPerlWrapperPtr;
- 
- /* Structure for command table */
---- swig/perl/ogr_wrap.cpp.orig	2008-03-25 20:45:42.000000000 +0200
-+++ swig/perl/ogr_wrap.cpp	2008-03-25 20:48:00.000000000 +0200
-@@ -1228,8 +1228,11 @@
- /* Macros for low-level exception handling */
- #define SWIG_croak(x)    { SWIG_Error(SWIG_RuntimeError, x); SWIG_fail; }
- 
-+#ifndef XSPROTO
-+# define XSPROTO(name) void name(pTHX_ CV* cv)
-+#endif
- 
--typedef XS(SwigPerlWrapper);
-+typedef XSPROTO(SwigPerlWrapper);
- typedef SwigPerlWrapper *SwigPerlWrapperPtr;
- 
- /* Structure for command table */
---- swig/perl/osr_wrap.cpp.orig	2008-03-25 20:49:16.000000000 +0200
-+++ swig/perl/osr_wrap.cpp	2008-03-25 20:49:33.000000000 +0200
-@@ -1229,7 +1229,11 @@
- #define SWIG_croak(x)    { SWIG_Error(SWIG_RuntimeError, x); SWIG_fail; }
- 
- 
--typedef XS(SwigPerlWrapper);
-+#ifndef XSPROTO
-+# define XSPROTO(name) void name(pTHX_ CV* cv)
-+#endif
-+
-+typedef XSPROTO(SwigPerlWrapper);
- typedef SwigPerlWrapper *SwigPerlWrapperPtr;
- 
- /* Structure for command table */

gdal.spec

@@ -1,30 +1,47 @@
 Name:      gdal
-Version:   1.5.1
-Release:   6%{?dist}
+Version:   1.5.3
+Release:   1%{?dist}
 Summary:   GIS file format library
 Group:     System Environment/Libraries
 License:   MIT
-URL:       http://gdal.maptools.org
+URL:       http://www.gdal.org/
 Source0:   %{name}-%{version}-fedora.tar.gz
 Source1:   http://download.osgeo.org/gdal/gdalautotest-1.5.0.tar.gz
-Patch0:    %{name}-gcc43.patch
-Patch1:    %{name}-perl510.patch
+Patch0:    %{name}-libdap.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtool swig pkgconfig
-BuildRequires: doxygen tetex-latex ghostscript
+BuildRequires: libtool pkgconfig
+BuildRequires: python-devel numpy xerces-c-devel
 BuildRequires: libpng-devel libungif-devel libjpeg-devel libtiff-devel
+BuildRequires: doxygen tetex-latex ghostscript ruby-devel jpackage-utils
 BuildRequires: jasper-devel cfitsio-devel hdf-devel libdap-devel librx-devel
 BuildRequires: unixODBC-devel mysql-devel sqlite-devel postgresql-devel zlib-devel
 BuildRequires: proj-devel geos-devel netcdf-devel hdf5-devel ogdi-devel libgeotiff-devel
-BuildRequires: python-devel >= 2.4 xerces-c-devel
 BuildRequires: perl(ExtUtils::MakeMaker)
 
+%if "%{?dist}" != ".el4"
+BuildRequires: ant swig ruby java-devel
+%endif
+
 # enable/disable grass support, for bootstrapping
 %define grass_support 1
 # enable/disable refman generation
 %define build_refman  1
 
-%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
+# we have multilib triage
+%if "%{_lib}" == "lib"
+%define cpuarch 32
+%else
+%define cpuarch 64
+%endif
+
+# Alpha is 64bit only but uses "lib" not "lib64"
+# Also true for ia64!?
+%ifarch alpha
+%define cpuarch 64
+%endif
+
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
 %if %{grass_support}
 BuildRequires: grass-devel
@@ -43,9 +60,17 @@ Requires: %{name} = %{version}-%{release}
 %description devel
 The GDAL library provides support to handle multiple GIS file formats.
 
+%package static
+Summary: Static Development Libraries for the GDAL file format library
+Group: Development/Libraries
+
+%description static
+The GDAL library provides support to handle multiple GIS file formats.
+
 %package python
 Summary: Python modules for the GDAL file format library
 Group: Development/Libraries
+Requires: numpy
 Requires: %{name} = %{version}-%{release}
 
 %description python
@@ -59,15 +84,41 @@ Requires: %{name} = %{version}-%{release}
 %description perl
 The GDAL perl modules provides support to handle multiple GIS file formats.
 
+%if "%{?dist}" != ".el4"
+%package ruby
+Summary: Ruby modules for the GDAL file format library
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description ruby
+The GDAL ruby  modules provides support to handle multiple GIS file formats.
+
+%package java
+Summary: Java modules for the GDAL file format library
+Group: Development/Libraries
+Requires: java
+Requires: jpackage-utils
+Requires: %{name} = %{version}-%{release}
+
+%description java
+The GDAL java modules provides support to handle multiple GIS file formats.
+%endif
+
 %prep
 %setup -q -n %{name}-%{version}-fedora
-%patch0 -p0 -b .gcc43
-%patch1 -p0 -b .perl510
+%if "%{?dist}" == ".fc10"
+%patch0 -p1 -b .libdap~
+%endif
 
 # unpack test cases olso.
 tar -xzf %{SOURCE1} .
 
-# fix wrongly encoded files from tarball
+# fix russian docs from tarball
+for ru in `find doc/ru/ -type f -name "*.dox"`; do
+iconv -f KOI8-R -t UTF-8 < $ru > $ru.tmp
+mv -f $ru.tmp  $ru
+done
+
 set +x
 for f in `find . -type f` ; do
    if file $f | grep -q ISO-8859 ; then
@@ -95,6 +146,7 @@ chmod -x ogr/ogrsf_frmts/ogdi/ogrogdi.h
 chmod -x ogr/ogrsf_frmts/ogdi/ogrogdilayer.cpp
 chmod -x ogr/ogrsf_frmts/ogdi/ogrogdidatasource.cpp
 chmod -x ogr/ogrsf_frmts/ogdi/ogrogdidriver.cpp
+find swig/python/samples -name "*.py" -exec chmod -x '{}' \;
 
 # bug 189337 c8
 # HAVE_NETCDF is not present anymore in hdf
@@ -133,21 +185,15 @@ sed -i 's|test \"$ARCH\" = \"x86_64\"|test \"$libdir\" = \"\/usr\/lib64\"|g' con
 # append some path for few libs
 export CPPFLAGS="`pkg-config ogdi --cflags`"
 export CPPFLAGS="$CPPFLAGS -I%{_includedir}/netcdf-3"
+export CPPFLAGS="$CPPFLAGS -I%{_includedir}/netcdf"
 export CPPFLAGS="$CPPFLAGS -I%{_includedir}/hdf"
 export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libgeotiff"
 export CPPFLAGS="$CPPFLAGS `dap-config --cflags`"
 export CPPFLAGS="$CPPFLAGS -DH5_USE_16_API"
 
 # code may contain sensible buffer overflows triggered by gcc ssp flag (mustfixupstream).
-export CXXFLAGS=`echo %{optflags}|sed -e 's/-Wp,-D_FORTIFY_SOURCE=2 //g'`
-export CFLAGS=`echo %{optflags}|sed -e 's/-Wp,-D_FORTIFY_SOURCE=2 //g'`
-
-# we have multilib ogdi-config
-%if "%{_lib}" == "lib"
-%define cpuarch 32
-%else
-%define cpuarch 64
-%endif
+export CXXFLAGS=`echo %{optflags}|sed -e 's/\-Wp\,-D_FORTIFY_SOURCE\=2 / -fPIC -DPIC /g'`
+export CFLAGS=`echo %{optflags}|sed -e 's/\-Wp\,\-D_FORTIFY_SOURCE\=2 / -fPIC -DPIC /g'`
 
 %configure \
         --prefix=%{_prefix} \
@@ -155,7 +201,7 @@ export CFLAGS=`echo %{optflags}|sed -e 's/-Wp,-D_FORTIFY_SOURCE=2 //g'`
         --datadir=%{_datadir}/%{name}/ \
         --with-threads      \
         --with-dods-root=%{_libdir} \
-        --with-ogdi=`ogdi-config-%{cpuarch} --libdir` \
+        --with-ogdi=`ogdi-config --libdir` \
         --with-cfitsio=%{_prefix} \
         --with-geotiff=external   \
         --with-tiff=external      \
@@ -175,6 +221,10 @@ export CFLAGS=`echo %{optflags}|sed -e 's/-Wp,-D_FORTIFY_SOURCE=2 //g'`
         --with-curl               \
         --with-python             \
         --with-perl               \
+%if "%{?dist}" != ".el4"
+        --with-ruby               \
+        --with-java               \
+%endif
         --with-xerces             \
         --with-xerces-lib='-lxerces-c' \
         --with-xerces-inc=%{_includedir} \
@@ -183,34 +233,69 @@ export CFLAGS=`echo %{optflags}|sed -e 's/-Wp,-D_FORTIFY_SOURCE=2 //g'`
 %if %{grass_support}
         --with-libgrass             \
         --with-grass=%{_prefix}     \
-        --disable-static
 %endif
 
 # fixup hardcoded wrong compile flags.
 cp GDALmake.opt GDALmake.opt.orig
-sed -e "s/^CFLAGS.*$/CFLAGS=$CFLAGS/" \
--e "s/^CXXFLAGS.*$/CXXFLAGS=$CXXFLAGS/" \
--e "s/^FFLAGS.*$/FFLAGS=$FFLAGS/" \
--e "s/ cfitsio / /" \
--e "s/-ldap++/-ldap -ldapclient -ldapserver/" \
--e "s/-L\$(INST_LIB) -lgdal/-lgdal/" \
+sed -e 's/ cfitsio / /' \
+-e 's/-ldap++/-ldap -ldapclient -ldapserver/' \
+-e 's/-L\$(INST_LIB) -lgdal/-lgdal/' \
 GDALmake.opt.orig > GDALmake.opt
 rm GDALmake.opt.orig
 
-# fixup non-existent lookup dir
-mkdir -p external/include
+# fix doxygen for multilib docs
+sed -i -e 's|^HTML_FOOTER|HTML_FOOTER = ../../doc/gdal_footer.html\n#HTML_FOOTER = |' swig/perl/Doxyfile
+sed -i -e 's|^HTML_FOOTER|HTML_FOOTER = ../../doc/gdal_footer.html\n#HTML_FOOTER = |' frmts/gxf/Doxyfile
+sed -i -e 's|^HTML_FOOTER|HTML_FOOTER = ../../doc/gdal_footer.html\n#HTML_FOOTER = |' frmts/sdts/Doxyfile
+sed -i -e 's|^HTML_FOOTER|HTML_FOOTER = ../../doc/gdal_footer.html\n#HTML_FOOTER = |' frmts/pcraster/doxygen.cfg
+sed -i -e 's|^HTML_FOOTER|HTML_FOOTER = ../../doc/gdal_footer.html\n#HTML_FOOTER = |' frmts/iso8211/Doxyfile
 
 # WARNING !!!
 # dont use {?_smp_mflags} it break compile
 make
-make docs
 
 # make perl modules, disable makefile generate
-pushd swig/perl; 
- perl Makefile.PL;  make; 
+pushd swig/perl
+ perl Makefile.PL;  make;
  echo > Makefile.PL;
 popd
 
+%if "%{?dist}" != ".el4"
+# make java modules
+pushd swig/java
+make generate
+# disable ColorEntry for now (gdal Ticket: #2331)
+rm -rf org/gdal/gdal/ColorTable.java
+make build
+popd
+%endif
+
+# remake documentation for multilib issues
+# olso include many pdf documentation
+for docdir in ./ doc doc/ru doc/br ogr ogr/ogrsf_frmts ogr/ogrsf_frmts/dgn frmts/gxf frmts/sdts frmts/iso8211 swig/perl; do
+cp -p doc/gdal_footer.html $docdir/footer_local.html
+pushd $docdir
+if [ ! -f Doxyfile ]; then
+doxygen -g
+fi
+sed -i -e 's|^HTML_FOOTER|HTML_FOOTER = footer_local.html\n#HTML_FOOTER |' Doxyfile
+sed -i -e 's|^GENERATE_LATEX|GENERATE_LATEX = YES\n#GENERATE_LATEX |' Doxyfile
+sed -i -e 's|^USE_PDFLATEX|USE_PDFLATEX = YES\n#USE_PDFLATEX |' Doxyfile
+if [ $docdir == "doc/ru" ]; then
+sed -i -e 's|^OUTPUT_LANGUAGE|OUTPUT_LANGUAGE = Russian\n#OUTPUT_LANGUAGE |' Doxyfile
+fi
+rm -rf latex html
+doxygen
+%if %{build_refman}
+pushd latex
+sed -i -e '/rfoot\[/d' -e '/lfoot\[/d' doxygen.sty
+sed -i -e '/small/d' -e '/large/d' refman.tex
+sed -i -e 's|pdflatex|pdflatex -interaction nonstopmode |g' Makefile
+make refman.pdf || true; popd
+%endif
+rm -rf footer_local.html; popd
+done
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -221,18 +306,87 @@ cat GNUmakefile | grep -v "\$(INSTALL_DIR) \$(DESTDIR)\$(INST_INCLUDE)" | \
                   grep -v "\$(INSTALL_DIR) \$(DESTDIR)\$(INST_DATA)" \
 > GNUmakefile.tmp; mv -f GNUmakefile.tmp GNUmakefile
 
+# fix python installation path
+sed -i 's|setup.py install|setup.py install --root=%{buildroot}|' swig/python/GNUmakefile
+
 make    DESTDIR=%{buildroot} \
         install
-        
+
 make    DESTDIR=%{buildroot} \
         INST_MAN=%{_mandir} \
-        install-man 
+        install-man
 
 # move perl modules in the right path
 mkdir -p %{buildroot}%{perl_vendorarch}
 mv %{buildroot}%{perl_sitearch}/* %{buildroot}%{perl_vendorarch}/
 find %{buildroot}%{perl_vendorarch} -name "*.dox" -exec rm -rf '{}' \;
 
+%if "%{?dist}" != ".el4"
+# move ruby modules in the right path
+mv %{buildroot}%{ruby_sitearch}/%{name}/*.* %{buildroot}%{ruby_sitearch}/
+rm -rf %{buildroot}%{ruby_sitearch}/%{name}
+
+# install multilib java modules in the right path
+touch -r NEWS swig/java/gdal.jar
+mkdir -p %{buildroot}%{_javadir}
+cp -p swig/java/gdal.jar  \
+      %{buildroot}%{_javadir}/%{name}-%{version}.jar
+%endif
+
+# fix some exec bits
+find %{buildroot}%{perl_vendorarch} -name "*.so" -exec chmod 755 '{}' \;
+find %{buildroot}%{python_sitearch} -name "*.so" -exec chmod 755 '{}' \;
+
+# install and include all docs
+rm -rf docs doc/docs-perl
+mkdir -p doc/gdal_frmts; find frmts -name "*.html" -exec install -p -m 644 '{}' doc/gdal_frmts/ \;
+mkdir -p doc/ogrsf_frmts; find ogr -name "*.html" -exec install -p -m 644 '{}' doc/ogrsf_frmts/ \;
+%if %{build_refman}
+mkdir -p docs/docs-%{cpuarch}/pdf
+pushd docs/docs-%{cpuarch}/pdf; mkdir -p br ru en ogr ogrsf_frmts/dgn frmts/gxf frmts/sdts frmts/iso8211 ; popd
+install -p -m 644 doc/latex/refman.pdf docs/docs-%{cpuarch}/pdf/en
+install -p -m 644 doc/br/latex/refman.pdf docs/docs-%{cpuarch}/pdf/br/
+#install -p -m 644 doc/ru/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ru/
+install -p -m 644 latex/refman.pdf docs/docs-%{cpuarch}/refman.pdf
+install -p -m 644 ogr/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogr/
+install -p -m 644 ogr/ogrsf_frmts/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogrsf_frmts/
+install -p -m 644 ogr/ogrsf_frmts/dgn/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogrsf_frmts/dgn/
+%if "%{?dist}" != ".el4"
+# broken on el4
+install -p -m 644 frmts/gxf/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/gxf/
+%endif
+install -p -m 644 frmts/sdts/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/sdts/
+install -p -m 644 frmts/iso8211/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/iso8211/
+mkdir -p doc/docs-perl/docs-%{cpuarch}/pdf
+install -p -m 644 swig/perl/latex/refman.pdf doc/docs-perl/docs-%{cpuarch}/pdf
+%endif
+pushd docs/docs-%{cpuarch}/; mkdir -p en/html gdal_frmts ogrsf_frmts br ru; popd
+cp -pr html/* docs/docs-%{cpuarch}/
+cp -pr doc/html/* docs/docs-%{cpuarch}/en/html
+cp -pr doc/gdal_frmts/* docs/docs-%{cpuarch}/gdal_frmts
+cp -pr doc/ogrsf_frmts/* docs/docs-%{cpuarch}/ogrsf_frmts
+cp -pr doc/br/html/* docs/docs-%{cpuarch}/br
+cp -pr doc/ru/html/* docs/docs-%{cpuarch}/ru
+cp -pr swig/perl/html/* doc/docs-perl/docs-%{cpuarch}/
+
+# install multilib cpl_config.h bz#430894
+install -p -m 644 port/cpl_config.h %{buildroot}%{_includedir}/%{name}/cpl_config-%{cpuarch}.h
+# create universal multilib cpl_config.h bz#341231
+cat > %{buildroot}%{_includedir}/%{name}/cpl_config.h <<EOF
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "gdal/cpl_config-32.h"
+#else
+#if __WORDSIZE == 64
+#include "gdal/cpl_config-64.h"
+#else
+#error "Unknown word size"
+#endif
+#endif
+EOF
+touch -r NEWS port/cpl_config.h
+
 # install pkgconfig file
 cat > %{name}.pc <<EOF
 prefix=%{_prefix}
@@ -249,31 +403,29 @@ EOF
 
 mkdir -p %{buildroot}%{_libdir}/pkgconfig/
 install -p -m 644 %{name}.pc %{buildroot}%{_libdir}/pkgconfig/
+touch -r NEWS %{buildroot}%{_libdir}/pkgconfig/
 
-# fix some exec bits
-find %{buildroot}%{perl_vendorarch} -name "*.so" -exec chmod 755 '{}' \;
+# multilib gdal-config
+mv %{buildroot}%{_bindir}/%{name}-config %{buildroot}%{_bindir}/%{name}-config-%{cpuarch}
+cat > %{buildroot}%{_bindir}/%{name}-config <<EOF
+#!/bin/bash
 
-# build and include more docs
-mkdir -p doc/frmts; find frmts -name "*.html" -exec install -m 644 '{}' doc/frmts/ \;
-mkdir -p doc/ogrsf_frmts; find ogr/ogrsf_frmts -name "*.html" -exec install -m 644 '{}' doc/ogrsf_frmts \;
-
-# some commented out are broken for now
-pushd doc; doxygen *.dox; popd
-pushd ogr/ogrsf_frmts; doxygen *.dox; popd
-%if %{build_refman}
-pushd ogr/ogrsf_frmts/latex; make refman.pdf; popd
-%endif
-pushd swig/perl; doxygen; popd
-%if %{build_refman}
-pushd swig/perl/latex; make refman.pdf; popd
-%endif
-
-# install cpl_config.h bz#430894
-install -p -m 644 port/cpl_config.h %{buildroot}%{_includedir}/%{name}/
+ARCH=\$(uname -m)
+case \$ARCH in
+x86_64 | ppc64 | ia64 | s390x | sparc64 | alpha | alphaev6 )
+%{name}-config-64 \${*}
+;;
+*)
+%{name}-config-32 \${*}
+;;
+esac
+EOF
+chmod 755 %{buildroot}%{_bindir}/%{name}-config
+touch -r NEWS %{buildroot}%{_bindir}/%{name}-config
 
 # cleanup junks
 rm -rf %{buildroot}%{_includedir}/%{name}/%{name}
-for junk in {*.a,*.la,*.bs,.exists,.packlist,.cvsignore} ; do
+for junk in {*.la,*.bs,.exists,.packlist,.cvsignore} ; do
 find %{buildroot} -name "$junk" -exec rm -rf '{}' \;
 done
 
@@ -295,7 +447,7 @@ rm -rf ogr/ogr_sql_test.py    # crash ugly  (mustfix)
 rm -rf gdrivers/dted.py       # crash ugly  (mustfix)
 
 # run tests but force than normal exit
-./run_all.py || exit 0
+./run_all.py || true
 
 popd
 
@@ -305,10 +457,10 @@ rm -rf $RPM_BUILD_ROOT
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc NEWS PROVENANCE.TXT-mainstream PROVENANCE.TXT-fedora COMMITERS
-%doc doc/frmts  
+%doc docs/
 %{_bindir}/gdal_contour
 %{_bindir}/gdal_rasterize
 %{_bindir}/gdal_translate
@@ -322,6 +474,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/gdaltransform
 %{_bindir}/nearblack
 %{_bindir}/ogr*
+%{_bindir}/testepsg
 %{_libdir}/*.so.*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
@@ -342,21 +495,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc html ogr/html 
-%doc ogr/wcts/html 
-%doc ogr/ogrsf_frmts/html 
-%if %{build_refman}
-%doc ogr/ogrsf_frmts/latex/refman.pdf
-%endif
+%doc docs
 %{_bindir}/%{name}-config
+%{_bindir}/%{name}-config-%{cpuarch}
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
 %{_mandir}/man1/%{name}-config*
 
+%files static
+%defattr(-,root,root,-)
+%{_libdir}/*.a
+
 %files python
 %defattr(-,root,root,-)
+%doc swig/python/samples
 %exclude %{_bindir}/*.py?
 %attr(0755,root,root) %{_bindir}/*.py
 %{python_sitearch}/*
@@ -366,14 +520,70 @@ rm -rf $RPM_BUILD_ROOT
 
 %files perl
 %defattr(-,root,root,-)
-%doc swig/perl/html 
-%if %{build_refman}
-%doc swig/perl/latex/refman.pdf
-%endif
+%doc doc/docs-perl
 %doc swig/perl/README
 %{perl_vendorarch}/*
 
+%if "%{?dist}" != ".el4"
+%files ruby
+%defattr(-,root,root,-)
+%{ruby_sitearch}/gdal.so
+%{ruby_sitearch}/ogr.so
+%{ruby_sitearch}/osr.so
+%{ruby_sitearch}/gdalconst.so
+
+%files java
+%defattr(-,root,root,-)
+%doc swig/java/apps
+%{_javadir}/%{name}-%{version}.jar
+%endif
+
 %changelog
+* Fri Oct 24 2008 Balint Cristian <rezso@rdsor.ro> - 1.5.3-1
+- new stable
+- ship static package too
+- fix some doc generation
+- libdap patch for fc10 only
+
+* Tue Sep 30 2008 Balint Cristian <rezso@rdsor.ro> - 1.5.2-4
+- enable gdal_array for python subpackage
+- require numpy
+
+* Tue Sep  9 2008 Patrice Dumas <pertusus@free.fr> - 1.5.2-3
+- patch for libdap > 0.8.0, from Rob Cermak
+
+* Thu Jun 12 2008 Balint Cristian <rezso@rdsor.ro> - 1.5.2-1
+- a new bugfix upstream
+- drop gcc43 patch
+- more license cleaned
+
+* Wed May 27 2008 Balint Cristian <rezso@rdsor.ro> - 1.5.1-13
+- fix pkgconfig too
+
+* Wed May 27 2008 Balint Cristian <rezso@rdsor.ro> - 1.5.1-12
+- fix once more gdal-config
+
+* Tue May 27 2008 Balint Cristian <rezso@rdsor.ro> - 1.5.1-11
+- fix multilib gdal-config, add wrapper around
+- fix typos in cpl_config.h wrapper
+
+* Tue May 27 2008 Balint Cristian <rezso@rdsor.ro> - 1.5.1-10
+- fix for multilib packaging bz#341231
+- huge spec cleanup
+- enable russian and brazil docs
+- enable and triage more docs
+
+* Sun May 25 2008 Balint Cristian <rezso@rdsor.ro> - 1.5.1-9
+- enable ruby and java packages
+- fix spurious sed problem
+- spec file cosmetics
+
+* Thu May 23 2008 Balint Cristian <rezso@rdsor.ro> - 1.5.1-8
+- fix sincos on all arch
+
+* Thu May 15 2008 Balint Cristian <rezso@rdsor.ro> - 1.5.1-7
+- fix x86_64 problem
+
 * Wed Apr 16 2008 Balint Cristian <rezso@rdsor.ro> - 1.5.1-6
 - disable fortify source, it crash gdal for now.
 

sources

@@ -1,2 +1,2 @@
-6027a5c46da797133ecee063cacec9c3  gdal-1.5.1-fedora.tar.gz
 e8a9a020f086a4ed977b30921785006f  gdalautotest-1.5.0.tar.gz
+cbd6bb3273bdb9a86d1ec0d2a07efe5b  gdal-1.5.3-fedora.tar.gz