dist-git conversion

.gitignore

@@ -1,3 +1,2 @@
-gdal-1.6.2.tar.gz
 gdal-1.6.2-fedora.tar.gz
 gdalautotest-1.6.0.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: gdal
-# $Id: Makefile,v 1.1 2007/03/04 21:57:46 wtogami Exp $
-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 $$d/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.spec

@@ -1,6 +1,6 @@
 Name:      gdal
 Version:   1.6.2
-Release:   5%{?dist}
+Release:   6%{?dist}
 Summary:   GIS file format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -167,6 +167,7 @@ sed -i 's|-lgeotiff -L$with_geotiff $LIBS|-lgeotiff $LIBS|g' configure
 sed -i 's|-L\$with_geotiff\/lib -lgeotiff $LIBS|-lgeotiff $LIBS|g' configure
 sed -i 's|-lmfhdf -ldf|-L$libdir/hdf -lmfhdf -ldf|g' configure
 sed -i 's|-logdi31|-logdi|g' configure
+sed -i 's|libproj.so|libproj.so.0|g' ogr/ogrct.cpp
 
 # fix python path for ppc64
 sed -i 's|test \"$ARCH\" = \"x86_64\"|test \"$libdir\" = \"\/usr\/lib64\"|g' configure
@@ -539,6 +540,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Mar 18 2010 Balint Cristian <cristian.balint@gmail.com> - 1.6.2.6
+- fix bz#572617
+
 * Fri Feb  5 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1.6.2-5
 - reenable grass support
 

import.log

@@ -1,9 +0,0 @@
-gdal-1_5_2-1_fc9:HEAD:gdal-1.5.2-1.fc9.src.rpm:1213299145
-gdal-1_5_2-4_fc10:HEAD:gdal-1.5.2-4.fc10.src.rpm:1222777883
-gdal-1_5_3-1_fc10:HEAD:gdal-1.5.3-1.fc10.src.rpm:1224848682
-gdal-1_6_0-0_1_rc4_fc11:HEAD:gdal-1.6.0-0.1.rc4.fc11.src.rpm:1228594658
-gdal-1_6_0-0_2_rc4_fc11:HEAD:gdal-1.6.0-0.2.rc4.fc11.src.rpm:1228602531
-gdal-1_6_0-1_fc11:HEAD:gdal-1.6.0-1.fc11.src.rpm:1229050992
-gdal-1_6_0-2_fc11:HEAD:gdal-1.6.0-2.fc11.src.rpm:1233238875
-gdal-1_6_0-3_fc11:HEAD:gdal-1.6.0-3.fc11.src.rpm:1233609041
-gdal-1_6_0-4_fc11:HEAD:gdal-1.6.0-4.fc11.src.rpm:1233754182

sources

@@ -1,3 +1,2 @@
-f2dcd6aa7222d021202984523adf3b55  gdal-1.6.2.tar.gz
 a5c60f9d1bb97eabe4e681a762fb19dc  gdal-1.6.2-fedora.tar.gz
 8ca6f8b83e0afb7a79040ac19c5b0b76  gdalautotest-1.6.0.tar.gz