- added ac patch

[packages/gdal.git] / gdal.spec

diff --git a/gdal.spec b/gdal.spec
index a4357f5cc7af60b4eb53aae83dd4dda790fef15d..192f4f4e04e5aac323d6e2829a455581ac0e6f50 100644 (file)
--- a/gdal.spec
+++ b/gdal.spec
@@ -1,20 +1,23 @@
 Summary:       Geospatial Data Abstraction Library
 Summary(pl):   Biblioteka abstrakcji danych dotycz±cych powierzchni Ziemi
 Name:          gdal
-Version:       1.3.1
+Version:       1.3.2
 Release:       2
 License:       BSD-like
 Group:         Libraries
-Source0:       ftp://ftp.remotesensing.org/pub/gdal/%{name}-%{version}.tar.gz
-# Source0-md5: 7ff1ceff745ee011793e1f860c02c172
+Source0:       ftp://ftp.gdal.org/gdal/%{name}-%{version}.tar.gz
+# Source0-md5: 67ed02dcea21e93f5e123bb0d322898a
 Patch0:                %{name}-pgsql.patch
 Patch1:                %{name}-DESTDIR.patch
 Patch2:                %{name}-dods.patch
-URL:           http://www.remotesensing.org/gdal/
+Patch3:                %{name}-gcc4.patch
+Patch4:                %{name}-ac.patch
+URL:           http://www.gdal.org/
 BuildRequires: autoconf
 BuildRequires: cfitsio-devel
 BuildRequires: doxygen
 BuildRequires: geos-devel >= 2.0
+BuildRequires: giflib-devel >= 4.0
 BuildRequires: hdf-devel >= 4.0
 BuildRequires: jasper-devel
 BuildRequires: libcsf-devel
@@ -24,7 +27,6 @@ BuildRequires:        libjpeg-devel >= 6b
 BuildRequires: libpng-devel >= 2:1.2.8
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel >= 3.6.0
-BuildRequires: libungif-devel >= 4.0
 BuildRequires: netcdf-devel
 BuildRequires: ogdi-devel >= 3.1
 BuildRequires: postgresql-devel
@@ -63,6 +65,7 @@ Group:                Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      cfitsio-devel
 Requires:      geos-devel >= 2.0
+Requires:      giflib-devel
 Requires:      hdf-devel >= 4.0
 Requires:      jasper-devel
 Requires:      libcsf-devel
@@ -72,7 +75,6 @@ Requires:     libjpeg-devel
 Requires:      libpng-devel >= 2:1.2.8
 Requires:      libstdc++-devel
 Requires:      libtiff-devel >= 3.6.0
-Requires:      libungif-devel
 Requires:      netcdf-devel
 Requires:      ogdi-devel >= 3.1
 Requires:      postgresql-devel
@@ -116,8 +118,8 @@ Modu
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-
-%{__perl} -pi -e "s@lib/python@%{_lib}/python@" aclocal.m4
+%patch3 -p1
+%patch4 -p1
 
 %build
 # disable grass/libgrass here, it can be built from separate gdal-grass package
@@ -145,6 +147,9 @@ rm -rf $RPM_BUILD_ROOT
 
 mv -f ogr/html html/org
 
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+%py_postclean
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
 
 %clean
@@ -155,7 +160,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog NEWS
+%doc NEWS PROVENANCE.TXT
 %attr(755,root,root) %{_bindir}/*
 %exclude %{_bindir}/gdal-config
 %attr(755,root,root) %{_libdir}/libgdal.so.*.*.*
@@ -174,9 +179,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libgdal.a
 
 %files -n python-gdal
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/_gdalmodule.so
-%{py_sitedir}/*.py
+%{py_sitedir}/*.py[co]