[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/gdal/FC-6 .cvsignore, 1.2, 1.3 gdal-buildfix.patch, 1.1, 1.2 gdal.spec, 1.7, 1.8 sources, 1.2, 1.3



Author: cbalint

Update of /cvs/extras/rpms/gdal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5224/FC-6

Modified Files:
	.cvsignore gdal-buildfix.patch gdal.spec sources 
Log Message:
new upstream release.
disable temporary grass-devel requirement untill find a
resonable solution for gdal-grass egg-chicken dep problem.
 Modified Files:
 	import.log FC-6/.cvsignore FC-6/gdal-buildfix.patch 
 	FC-6/gdal.spec FC-6/sources 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdal/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Mar 2007 17:27:55 -0000	1.2
+++ .cvsignore	9 May 2007 18:02:09 -0000	1.3
@@ -1 +1 @@
-gdal-1.4.0-fedora.tar.gz
+gdal-1.4.1-fedora.tar.gz

gdal-buildfix.patch:

Index: gdal-buildfix.patch
===================================================================
RCS file: /cvs/extras/rpms/gdal/FC-6/gdal-buildfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdal-buildfix.patch	14 Mar 2007 17:27:55 -0000	1.1
+++ gdal-buildfix.patch	9 May 2007 18:02:09 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nru gdal-1.4.0-fedora/configure gdal-1.4.0-fedora.work/configure
---- gdal-1.4.0-fedora/configure	2006-12-29 20:17:00.000000000 +0100
-+++ gdal-1.4.0-fedora.work/configure	2007-02-27 23:12:00.000000000 +0100
+diff -Nru gdal-1.4.1-fedora/configure gdal-1.4.1-fedora-patched/configure
+--- gdal-1.4.1-fedora/configure	2007-04-10 17:16:54.000000000 +0200
++++ gdal-1.4.1-fedora-patched/configure	2007-05-09 19:37:21.000000000 +0200
 @@ -23371,6 +23371,12 @@
  
    echo "using internal GeoTIFF code."
@@ -14,9 +14,9 @@
  else
  
    GEOTIFF_SETTING=external
-diff -Nru gdal-1.4.0-fedora/configure.in gdal-1.4.0-fedora.work/configure.in
---- gdal-1.4.0-fedora/configure.in	2006-12-29 20:17:00.000000000 +0100
-+++ gdal-1.4.0-fedora.work/configure.in	2007-02-27 23:12:00.000000000 +0100
+diff -Nru gdal-1.4.1-fedora/configure.in gdal-1.4.1-fedora-patched/configure.in
+--- gdal-1.4.1-fedora/configure.in	2007-04-10 17:16:55.000000000 +0200
++++ gdal-1.4.1-fedora-patched/configure.in	2007-05-09 19:37:21.000000000 +0200
 @@ -612,6 +612,12 @@
  
    echo "using internal GeoTIFF code."
@@ -30,24 +30,10 @@
  else
  
    GEOTIFF_SETTING=external
-diff -Nru gdal-1.4.0-fedora/frmts/formats_list.html gdal-1.4.0-fedora.work/frmts/formats_list.html
---- gdal-1.4.0-fedora/frmts/formats_list.html	2006-11-02 03:40:47.000000000 +0100
-+++ gdal-1.4.0-fedora.work/frmts/formats_list.html	2007-02-27 23:20:18.000000000 +0100
-@@ -157,13 +157,6 @@
- </td><td> --
- </td></tr>
- 
--<tr><td> <a href="frmt_gtiff.html">TIFF / GeoTIFF (.tif)</a>
--</td><td> GTiff
--</td><td> Yes
--</td><td> Yes
--</td><td> 4GiB
--</td></tr>
--
- <tr><td> <a href="frmt_hdf4.html">Hierarchical Data Format Release 4 (HDF4)</a>
- </td><td> HDF4
- </td><td> Yes
-@@ -178,13 +171,6 @@
+diff -Nru gdal-1.4.1-fedora/frmts/formats_list.html gdal-1.4.1-fedora-patched/frmts/formats_list.html
+--- gdal-1.4.1-fedora/frmts/formats_list.html	2007-04-10 17:16:26.000000000 +0200
++++ gdal-1.4.1-fedora-patched/frmts/formats_list.html	2007-05-09 19:38:52.000000000 +0200
+@@ -178,13 +178,6 @@
  </td><td> 2GiB
  </td></tr>
  
@@ -61,6 +47,20 @@
  <tr><td> <a href="frmt_mff2.html">Vexcel MFF2</a>
  </td><td> HKV
  </td><td> Yes
+@@ -262,13 +255,6 @@
+ </td><td> --
+ </td></tr>
+ 
+-<tr><td> <a href="frmt_various.html#LAN">Erdas 7.x .LAN and .GIS</a>
+-</td><td> LAN
+-</td><td> No
+-</td><td> Yes
+-</td><td> 2GB
+-</td></tr>
+-
+ <tr><td> <a href="frmt_leveller.html">Daylon Leveller Heightfield</a>
+ </td><td> Leveller
+ </td><td> Yes
 @@ -440,12 +426,6 @@
  </p>
  
@@ -74,10 +74,10 @@
  $Id$
  </p>
  
-diff -Nru gdal-1.4.0-fedora/frmts/gdalallregister.cpp gdal-1.4.0-fedora.work/frmts/gdalallregister.cpp
---- gdal-1.4.0-fedora/frmts/gdalallregister.cpp	2006-11-13 19:39:46.000000000 +0100
-+++ gdal-1.4.0-fedora.work/frmts/gdalallregister.cpp	2007-02-27 23:19:51.000000000 +0100
-@@ -177,10 +177,6 @@
+diff -Nru gdal-1.4.1-fedora/frmts/gdalallregister.cpp gdal-1.4.1-fedora-patched/frmts/gdalallregister.cpp
+--- gdal-1.4.1-fedora/frmts/gdalallregister.cpp	2007-04-10 17:16:26.000000000 +0200
++++ gdal-1.4.1-fedora-patched/frmts/gdalallregister.cpp	2007-05-09 19:37:21.000000000 +0200
+@@ -88,10 +88,6 @@
      GDALRegister_NITF();
  #endif
  
@@ -88,9 +88,9 @@
  #ifdef FRMT_ceos2
      GDALRegister_SAR_CEOS();
  #endif
-diff -Nru gdal-1.4.0-fedora/frmts/makefile.vc gdal-1.4.0-fedora.work/frmts/makefile.vc
---- gdal-1.4.0-fedora/frmts/makefile.vc	2006-11-02 04:12:45.000000000 +0100
-+++ gdal-1.4.0-fedora.work/frmts/makefile.vc	2007-02-27 23:19:46.000000000 +0100
+diff -Nru gdal-1.4.1-fedora/frmts/makefile.vc gdal-1.4.1-fedora-patched/frmts/makefile.vc
+--- gdal-1.4.1-fedora/frmts/makefile.vc	2007-04-10 17:16:26.000000000 +0200
++++ gdal-1.4.1-fedora-patched/frmts/makefile.vc	2007-05-09 19:37:21.000000000 +0200
 @@ -1,7 +1,7 @@
  
  GDAL_ROOT = ..
@@ -100,9 +100,9 @@
  		-DFRMT_sdts -DFRMT_raw -DFRMT_gxf -DFRMT_ceos2 -DFRMT_png \
  		-DFRMT_dted -DFRMT_mem -DFRMT_jdem -DFRMT_gif \
  		-DFRMT_envisat -DFRMT_aaigrid -DFRMT_usgsdem -DFRMT_l1b \
-diff -Nru gdal-1.4.0-fedora/frmts/mrsid/makefile.vc gdal-1.4.0-fedora.work/frmts/mrsid/makefile.vc
---- gdal-1.4.0-fedora/frmts/mrsid/makefile.vc	2006-09-19 20:30:38.000000000 +0200
-+++ gdal-1.4.0-fedora.work/frmts/mrsid/makefile.vc	2007-02-27 23:12:00.000000000 +0100
+diff -Nru gdal-1.4.1-fedora/frmts/mrsid/makefile.vc gdal-1.4.1-fedora-patched/frmts/mrsid/makefile.vc
+--- gdal-1.4.1-fedora/frmts/mrsid/makefile.vc	2007-04-10 17:16:25.000000000 +0200
++++ gdal-1.4.1-fedora-patched/frmts/mrsid/makefile.vc	2007-05-09 19:37:21.000000000 +0200
 @@ -1,7 +1,7 @@
  
  OBJ	=	mrsiddataset.obj
@@ -112,10 +112,10 @@
  
  GDAL_ROOT	=	..\..
  
-diff -Nru gdal-1.4.0-fedora/gcore/gdaldefaultoverviews.cpp gdal-1.4.0-fedora.work/gcore/gdaldefaultoverviews.cpp
---- gdal-1.4.0-fedora/gcore/gdaldefaultoverviews.cpp	2006-11-28 13:57:51.000000000 +0100
-+++ gdal-1.4.0-fedora.work/gcore/gdaldefaultoverviews.cpp	2007-02-27 23:56:09.000000000 +0100
-@@ -388,31 +388,6 @@
+diff -Nru gdal-1.4.1-fedora/gcore/gdaldefaultoverviews.cpp gdal-1.4.1-fedora-patched/gcore/gdaldefaultoverviews.cpp
+--- gdal-1.4.1-fedora/gcore/gdaldefaultoverviews.cpp	2007-04-10 17:16:29.000000000 +0200
++++ gdal-1.4.1-fedora-patched/gcore/gdaldefaultoverviews.cpp	2007-05-09 19:37:21.000000000 +0200
+@@ -327,31 +327,6 @@
  /*      produce the imagery.                                            */
  /* -------------------------------------------------------------------- */
  
@@ -147,7 +147,7 @@
      {
          if( poODS != NULL )
          {
-@@ -420,10 +395,6 @@
+@@ -359,10 +334,6 @@
              poODS = NULL;
          }
  
@@ -158,10 +158,10 @@
          if( eErr == CE_None )
          {
              poODS = (GDALDataset *) GDALOpen( osOvrFilename, GA_Update );
-diff -Nru gdal-1.4.0-fedora/gcore/gdal_frmts.h gdal-1.4.0-fedora.work/gcore/gdal_frmts.h
---- gdal-1.4.0-fedora/gcore/gdal_frmts.h	2006-11-12 20:59:30.000000000 +0100
-+++ gdal-1.4.0-fedora.work/gcore/gdal_frmts.h	2007-02-27 23:23:45.000000000 +0100
-@@ -108,10 +108,8 @@
+diff -Nru gdal-1.4.1-fedora/gcore/gdal_frmts.h gdal-1.4.1-fedora-patched/gcore/gdal_frmts.h
+--- gdal-1.4.1-fedora/gcore/gdal_frmts.h	2007-04-10 17:16:29.000000000 +0200
++++ gdal-1.4.1-fedora-patched/gcore/gdal_frmts.h	2007-05-09 19:37:21.000000000 +0200
+@@ -34,10 +34,8 @@
  
  CPL_C_START
  void CPL_DLL GDALRegister_GDB(void);
@@ -172,10 +172,10 @@
  void CPL_DLL GDALRegister_AAIGrid(void);
  void CPL_DLL GDALRegister_AIGrid(void);
  void CPL_DLL GDALRegister_AIGrid2(void);
-diff -Nru gdal-1.4.0-fedora/gcore/gdaljp2metadata.cpp gdal-1.4.0-fedora.work/gcore/gdaljp2metadata.cpp
---- gdal-1.4.0-fedora/gcore/gdaljp2metadata.cpp	2006-07-21 17:23:01.000000000 +0200
-+++ gdal-1.4.0-fedora.work/gcore/gdaljp2metadata.cpp	2007-02-27 23:12:00.000000000 +0100
-@@ -85,13 +85,13 @@
+diff -Nru gdal-1.4.1-fedora/gcore/gdaljp2metadata.cpp gdal-1.4.1-fedora-patched/gcore/gdaljp2metadata.cpp
+--- gdal-1.4.1-fedora/gcore/gdaljp2metadata.cpp	2007-04-10 17:16:29.000000000 +0200
++++ gdal-1.4.1-fedora-patched/gcore/gdaljp2metadata.cpp	2007-05-09 19:37:21.000000000 +0200
+@@ -45,13 +45,13 @@
    0xA7,0xAE,0xD6,0x8E,0x34,0x45,0x18,0x09 };
  
  CPL_C_START
@@ -191,7 +191,7 @@
  CPL_C_END
  
  /************************************************************************/
-@@ -336,13 +336,13 @@
+@@ -296,13 +296,13 @@
  /* -------------------------------------------------------------------- */
      int bSuccess = TRUE;
  
@@ -207,7 +207,7 @@
      if( pszProjection == NULL || strlen(pszProjection) == 0 )
          bSuccess = FALSE;
  
-@@ -764,9 +764,10 @@
+@@ -724,9 +724,10 @@
      int         nGTBufSize = 0;
      unsigned char *pabyGTBuf = NULL;
  
@@ -219,10 +219,10 @@
          return NULL;
  
      if( nGTBufSize == 0 )
-diff -Nru gdal-1.4.0-fedora/gcore/gdal_priv.h gdal-1.4.0-fedora.work/gcore/gdal_priv.h
---- gdal-1.4.0-fedora/gcore/gdal_priv.h	2006-11-28 13:56:53.000000000 +0100
-+++ gdal-1.4.0-fedora.work/gcore/gdal_priv.h	2007-02-27 23:55:04.000000000 +0100
-@@ -700,26 +700,6 @@
+diff -Nru gdal-1.4.1-fedora/gcore/gdal_priv.h gdal-1.4.1-fedora-patched/gcore/gdal_priv.h
+--- gdal-1.4.1-fedora/gcore/gdal_priv.h	2007-04-10 17:16:29.000000000 +0200
++++ gdal-1.4.1-fedora-patched/gcore/gdal_priv.h	2007-05-09 19:37:21.000000000 +0200
+@@ -612,26 +612,6 @@
  
  CPL_C_START
  
@@ -249,9 +249,9 @@
  CPLErr CPL_DLL
  GDALDefaultBuildOverviews( GDALDataset *hSrcDS, const char * pszBasename,
                             const char * pszResampling, 
-diff -Nru gdal-1.4.0-fedora/GDALmake.opt.in gdal-1.4.0-fedora.work/GDALmake.opt.in
---- gdal-1.4.0-fedora/GDALmake.opt.in	2006-12-05 03:18:11.000000000 +0100
-+++ gdal-1.4.0-fedora.work/GDALmake.opt.in	2007-02-27 23:19:12.000000000 +0100
+diff -Nru gdal-1.4.1-fedora/GDALmake.opt.in gdal-1.4.1-fedora-patched/GDALmake.opt.in
+--- gdal-1.4.1-fedora/GDALmake.opt.in	2007-04-10 17:16:55.000000000 +0200
++++ gdal-1.4.1-fedora-patched/GDALmake.opt.in	2007-05-09 19:37:21.000000000 +0200
 @@ -311,7 +311,7 @@
  #	and their uppercase form should be the format portion of the
  #	format registration entry point.  eg. gdb -> GDALRegister_GDB().
@@ -261,9 +261,9 @@
  		sdts raw dted mem jdem envisat elas fit vrt usgsdem l1b \
  		nitf bmp pcidsk airsar rs2 ilwis rmf rik leveller sgi \
  		idrisi \
-diff -Nru gdal-1.4.0-fedora/ogr/Makefile gdal-1.4.0-fedora.work/ogr/Makefile
---- gdal-1.4.0-fedora/ogr/Makefile	2006-11-18 21:37:43.000000000 +0100
-+++ gdal-1.4.0-fedora.work/ogr/Makefile	2007-02-27 23:12:00.000000000 +0100
+diff -Nru gdal-1.4.1-fedora/ogr/Makefile gdal-1.4.1-fedora-patched/ogr/Makefile
+--- gdal-1.4.1-fedora/ogr/Makefile	2007-04-10 17:15:09.000000000 +0200
++++ gdal-1.4.1-fedora-patched/ogr/Makefile	2007-05-09 19:37:21.000000000 +0200
 @@ -2,7 +2,7 @@
  LINKFLAGS =	/Zi /MTd
  EXTRAFLAGS =	-I$(MSDASDK)\inc \
@@ -273,10 +273,10 @@
  		$(PROJ_FLAGS) $(PROJ_INCLUDE) $(GEOS_CFLAGS)
  
  GDAL_ROOT = 	..
-diff -Nru gdal-1.4.0-fedora/ogr/ogrsf_frmts/generic/ogrregisterall.cpp gdal-1.4.0-fedora.work/ogr/ogrsf_frmts/generic/ogrregisterall.cpp
---- gdal-1.4.0-fedora/ogr/ogrsf_frmts/generic/ogrregisterall.cpp	2006-11-28 16:34:41.000000000 +0100
-+++ gdal-1.4.0-fedora.work/ogr/ogrsf_frmts/generic/ogrregisterall.cpp	2007-02-27 23:54:17.000000000 +0100
-@@ -160,9 +160,6 @@
+diff -Nru gdal-1.4.1-fedora/ogr/ogrsf_frmts/generic/ogrregisterall.cpp gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/generic/ogrregisterall.cpp
+--- gdal-1.4.1-fedora/ogr/ogrsf_frmts/generic/ogrregisterall.cpp	2007-04-10 17:14:53.000000000 +0200
++++ gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/generic/ogrregisterall.cpp	2007-05-09 19:37:21.000000000 +0200
+@@ -57,9 +57,6 @@
  #ifdef S57_ENABLED
      RegisterOGRS57();
  #endif
@@ -286,7 +286,7 @@
  #ifdef VRT_ENABLED
      RegisterOGRVRT();
  #endif
-@@ -184,10 +181,6 @@
+@@ -81,10 +78,6 @@
  #ifdef KML_ENABLED
      RegisterOGRKML();
  #endif
@@ -297,9 +297,9 @@
  #ifdef SQLITE_ENABLED
      RegisterOGRSQLite();
  #endif
-diff -Nru gdal-1.4.0-fedora/ogr/ogrsf_frmts/GNUmakefile gdal-1.4.0-fedora.work/ogr/ogrsf_frmts/GNUmakefile
---- gdal-1.4.0-fedora/ogr/ogrsf_frmts/GNUmakefile	2006-11-28 16:34:41.000000000 +0100
-+++ gdal-1.4.0-fedora.work/ogr/ogrsf_frmts/GNUmakefile	2007-02-27 23:46:34.000000000 +0100
+diff -Nru gdal-1.4.1-fedora/ogr/ogrsf_frmts/GNUmakefile gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/GNUmakefile
+--- gdal-1.4.1-fedora/ogr/ogrsf_frmts/GNUmakefile	2007-04-10 17:15:02.000000000 +0200
++++ gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/GNUmakefile	2007-05-09 19:37:21.000000000 +0200
 @@ -1,7 +1,7 @@
  
  include ../../GDALmake.opt
@@ -317,9 +317,9 @@
  SUBDIRS-$(HAVE_DWGDIRECT) += dxfdwg
  SUBDIRS-$(HAVE_SDE)     += sde
  SUBDIRS-$(HAVE_IDB)	+= idb
-diff -Nru gdal-1.4.0-fedora/ogr/ogrsf_frmts/Makefile gdal-1.4.0-fedora.work/ogr/ogrsf_frmts/Makefile
---- gdal-1.4.0-fedora/ogr/ogrsf_frmts/Makefile	2006-11-28 17:19:47.000000000 +0100
-+++ gdal-1.4.0-fedora.work/ogr/ogrsf_frmts/Makefile	2007-02-27 23:46:48.000000000 +0100
+diff -Nru gdal-1.4.1-fedora/ogr/ogrsf_frmts/Makefile gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/Makefile
+--- gdal-1.4.1-fedora/ogr/ogrsf_frmts/Makefile	2007-04-10 17:15:02.000000000 +0200
++++ gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/Makefile	2007-05-09 19:37:21.000000000 +0200
 @@ -1,6 +1,6 @@
  GDAL_ROOT	=	..\..
  
@@ -349,9 +349,9 @@
  				 vrt\*.obj csv\*.obj rec\*.obj kml\*.obj \
  				$(OGDIOBJ) $(ODBCOBJ) $(SQLITE_OBJ) \
  				$(FMEOBJ) $(OCIOBJ) $(PG_OBJ) $(MYSQL_OBJ) \
-diff -Nru gdal-1.4.0-fedora/ogr/ogrsf_frmts/ogr_formats.html gdal-1.4.0-fedora.work/ogr/ogrsf_frmts/ogr_formats.html
---- gdal-1.4.0-fedora/ogr/ogrsf_frmts/ogr_formats.html	2006-12-19 04:40:52.000000000 +0100
-+++ gdal-1.4.0-fedora.work/ogr/ogrsf_frmts/ogr_formats.html	2007-02-27 23:37:55.000000000 +0100
+diff -Nru gdal-1.4.1-fedora/ogr/ogrsf_frmts/ogr_formats.html gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/ogr_formats.html
+--- gdal-1.4.1-fedora/ogr/ogrsf_frmts/ogr_formats.html	2007-04-10 17:15:02.000000000 +0200
++++ gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/ogr_formats.html	2007-05-09 19:37:21.000000000 +0200
 @@ -85,11 +85,6 @@
  </td><td> Yes
  </td></tr>
@@ -364,10 +364,10 @@
  <tr><td> <a href="drv_mysql.html">MySQL</a>
  </td><td> No
  </td><td> No
-diff -Nru gdal-1.4.0-fedora/ogr/ogrsf_frmts/ogrsf_frmts.h gdal-1.4.0-fedora.work/ogr/ogrsf_frmts/ogrsf_frmts.h
---- gdal-1.4.0-fedora/ogr/ogrsf_frmts/ogrsf_frmts.h	2006-12-13 19:24:45.000000000 +0100
-+++ gdal-1.4.0-fedora.work/ogr/ogrsf_frmts/ogrsf_frmts.h	2007-02-27 23:54:11.000000000 +0100
-@@ -374,7 +374,6 @@
+diff -Nru gdal-1.4.1-fedora/ogr/ogrsf_frmts/ogrsf_frmts.h gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/ogrsf_frmts.h
+--- gdal-1.4.1-fedora/ogr/ogrsf_frmts/ogrsf_frmts.h	2007-04-10 17:15:02.000000000 +0200
++++ gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/ogrsf_frmts.h	2007-05-09 19:37:21.000000000 +0200
+@@ -310,7 +310,6 @@
  void CPL_DLL RegisterOGRPG();
  void CPL_DLL RegisterOGRMySQL();
  void CPL_DLL RegisterOGROCI();
@@ -375,7 +375,7 @@
  void CPL_DLL RegisterOGRGML();
  void CPL_DLL RegisterOGRKML();
  void CPL_DLL RegisterOGRAVCBin();
-@@ -385,8 +384,6 @@
+@@ -321,8 +320,6 @@
  void CPL_DLL RegisterOGRDODS();
  void CPL_DLL RegisterOGRSQLite();
  void CPL_DLL RegisterOGRCSV();


Index: gdal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdal/FC-6/gdal.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gdal.spec	20 Apr 2007 11:05:17 -0000	1.7
+++ gdal.spec	9 May 2007 18:02:09 -0000	1.8
@@ -1,6 +1,6 @@
 Name:      gdal
-Version:   1.4.0
-Release:   20%{?dist}
+Version:   1.4.1
+Release:   1%{?dist}
 Summary:   GIS file format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -13,7 +13,7 @@
 BuildRequires: libpng-devel libungif-devel libjpeg-devel libtiff-devel
 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 grass-devel
+BuildRequires: proj-devel geos-devel netcdf-devel hdf5-devel ogdi-devel
 BuildRequires: python-devel >= 2.4 xerces-c-devel
 BuildRequires: perl(ExtUtils::MakeMaker)
 
@@ -105,7 +105,6 @@
         --prefix=%{_prefix} \
         --includedir=%{_includedir}/%{name}/ \
         --with-threads      \
-        --with-grass=%{_prefix}     \
         --with-libgrass             \
         --with-dods-root=%{_libdir} \
         --with-ogdi=`ogdi-config --libdir` \
@@ -134,6 +133,7 @@
         --without-pcraster        \
         --enable-shared           \
         --disable-static
+#        --with-grass=%{_prefix}     
 
 # fixup hardcoded wrong compile flags.
 cp GDALmake.opt GDALmake.opt.orig
@@ -209,11 +209,13 @@
 # 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 \;
-pushd doc; doxygen index.dox; popd
+
+# some commented out are broken for now
+#pushd doc; doxygen index.dox; popd
 pushd rfc; doxygen *.dox; popd
 pushd rfc/latex; make refman.pdf; popd
-pushd ogr/ogrsf_frmts; doxygen *.dox; popd
-pushd ogr/ogrsf_frmts/latex; make refman.pdf; popd
+#pushd ogr/ogrsf_frmts; doxygen *.dox; popd
+#pushd ogr/ogrsf_frmts/latex; make refman.pdf; popd
 pushd swig/perl; doxygen; popd
 pushd swig/perl/latex; make refman.pdf; popd
 
@@ -231,7 +233,8 @@
 %files 
 %defattr(-,root,root,-)
 %doc NEWS PROVENANCE.TXT-mainstream PROVENANCE.TXT-fedora COMMITERS
-%doc doc/frmts doc/ogrsf_frmts doc/html
+%doc doc/frmts  
+#%doc doc/ogrsf_frmts doc/html
 %{_bindir}/gdal_contour
 %{_bindir}/gdal_rasterize
 %{_bindir}/gdal_translate
@@ -256,8 +259,9 @@
 %files devel
 %defattr(-,root,root,-)
 %doc html ogr/html rfc/html rfc/latex/refman.pdf 
-%doc ogr/wcts/html ogr/ogrsf_frmts/html 
-%doc ogr/ogrsf_frmts/latex/refman.pdf
+%doc ogr/wcts/html 
+#%doc ogr/ogrsf_frmts/html 
+#%doc ogr/ogrsf_frmts/latex/refman.pdf
 %{_bindir}/%{name}-config
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*.h
@@ -282,6 +286,17 @@
 %{perl_vendorarch}/*
 
 %changelog
+* Wed May 09 2007 Balint Cristian <cbalint redhat com> 1.4.1-1
+- new upstream release.
+- disable temporary grass-devel requirement untill find a
+  resonable solution for gdal-grass egg-chicken dep problem.
+
+* Fri Apr 20 2007 Balint Cristian <cbalint redhat com> 1.4.0-22
+- and olso dont attempt pack missing docs.
+
+* Fri Apr 20 2007 Balint Cristian <cbalint redhat com> 1.4.0-21
+- exclude some docs, doxygen segfault with those now upstream.
+
 * Fri Apr 20 2007 Balint Cristian <cbalint redhat com> 1.4.0-20
 - rebuild against latest fedora upstream tree.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdal/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Mar 2007 17:27:55 -0000	1.2
+++ sources	9 May 2007 18:02:09 -0000	1.3
@@ -1 +1 @@
-757ea87048931beb4d1b068e2835732c  gdal-1.4.0-fedora.tar.gz
+0cdfc9f365371ea1dbff3b1349197084  gdal-1.4.1-fedora.tar.gz


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]