rpms/gdal/F-9 gdal-libdap.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 gdal.spec, 1.41, 1.42 import.log, 1.3, 1.4 sources, 1.8, 1.9 gdal-perl510.patch, 1.1, NONE gdal-sincos.patch, 1.1, NONE

[Balint Cristian]

Author: rezso

Update of /cvs/pkgs/rpms/gdal/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5828/F-9

Modified Files:
	.cvsignore gdal.spec import.log sources 
Added Files:
	gdal-libdap.patch 
Removed Files:
	gdal-perl510.patch gdal-sincos.patch 
Log Message:
- new stable                                                                                                   
- ship static package too                                                                                      
- fix some doc generation                                                                                      
- libdap patch for fc10 only


gdal-libdap.patch:

--- NEW FILE gdal-libdap.patch ---
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                           */
 /************************************************************************/


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	12 Jun 2008 20:21:57 -0000	1.8
+++ .cvsignore	24 Oct 2008 11:58:00 -0000	1.9
@@ -1,2 +1,2 @@
 gdalautotest-1.5.0.tar.gz
-gdal-1.5.2-fedora.tar.gz
+gdal-1.5.3-fedora.tar.gz


Index: gdal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/F-9/gdal.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gdal.spec	12 Jun 2008 20:21:57 -0000	1.41
+++ gdal.spec	24 Oct 2008 11:58:00 -0000	1.42
@@ -1,5 +1,5 @@
 Name:      gdal
-Version:   1.5.2
+Version:   1.5.3
 Release:   1%{?dist}
 Summary:   GIS file format library
 Group:     System Environment/Libraries
@@ -7,16 +7,15 @@
 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}-perl510.patch
-Patch1:    %{name}-sincos.patch
+Patch0:    %{name}-libdap.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 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 xerces-c-devel
 BuildRequires: perl(ExtUtils::MakeMaker)
 
 %if "%{?dist}" != ".el4"
@@ -55,9 +54,17 @@
 %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
@@ -93,8 +100,9 @@
 
 %prep
 %setup -q -n %{name}-%{version}-fedora
-%patch0 -p0 -b .perl510~
-%patch1 -p0 -b .sincos~
+%if "%{?dist}" == ".fc10"
+%patch0 -p1 -b .libdap~
+%endif
 
 # unpack test cases olso.
 tar -xzf %{SOURCE1} .
@@ -219,7 +227,6 @@
 %if %{grass_support}
         --with-libgrass             \
         --with-grass=%{_prefix}     \
-        --disable-static
 %endif
 
 # fixup hardcoded wrong compile flags.
@@ -252,7 +259,7 @@
 pushd swig/java
 make generate
 # disable ColorEntry for now (gdal Ticket: #2331)
-rm -rf org/gdal/gdal/ColorEntry.java
+rm -rf org/gdal/gdal/ColorTable.java
 make build
 popd
 %endif
@@ -293,6 +300,9 @@
                   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
 
@@ -330,7 +340,7 @@
 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 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/
@@ -409,7 +419,7 @@
 
 # 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
 
@@ -458,6 +468,7 @@
 %{_bindir}/gdaltransform
 %{_bindir}/nearblack
 %{_bindir}/ogr*
+%{_bindir}/testepsg
 %{_libdir}/*.so.*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
@@ -487,6 +498,10 @@
 %{_libdir}/pkgconfig/%{name}.pc
 %{_mandir}/man1/%{name}-config*
 
+%files static
+%defattr(-,root,root,-)
+%{_libdir}/*.a
+
 %files python
 %defattr(-,root,root,-)
 %doc swig/python/samples
@@ -518,6 +533,19 @@
 %endif
 
 %changelog
+* Fri Oct 24 2008 Balint Cristian <rezso at 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 at rdsor.ro> - 1.5.2-4
+- enable gdal_array for python subpackage
+- require numpy
+
+* Tue Sep  9 2008 Patrice Dumas <pertusus at free.fr> - 1.5.2-3
+- patch for libdap > 0.8.0, from Rob Cermak
+
 * Thu Jun 12 2008 Balint Cristian <rezso at rdsor.ro> - 1.5.2-1
 - a new bugfix upstream
 - drop gcc43 patch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	12 Jun 2008 20:21:57 -0000	1.3
+++ import.log	24 Oct 2008 11:58:00 -0000	1.4
@@ -1 +1,2 @@
 gdal-1_5_2-1_fc9:F-9:gdal-1.5.2-1.fc9.src.rpm:1213301227
+gdal-1_5_3-1_fc10:F-9:gdal-1.5.3-1.fc10.src.rpm:1224849425


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Jun 2008 20:21:57 -0000	1.8
+++ sources	24 Oct 2008 11:58:00 -0000	1.9
@@ -1,2 +1,2 @@
 e8a9a020f086a4ed977b30921785006f  gdalautotest-1.5.0.tar.gz
-b032dc858b5af1246023863317230701  gdal-1.5.2-fedora.tar.gz
+cbd6bb3273bdb9a86d1ec0d2a07efe5b  gdal-1.5.3-fedora.tar.gz


--- gdal-perl510.patch DELETED ---


--- gdal-sincos.patch DELETED ---