- updated for 1.2.0

[packages/gdal.git] / gdal.spec

diff --git a/gdal.spec b/gdal.spec
index 8d03d5bd94c2f0bf8a1642082bb93b7616cd06d5..6995e1413604df402761fe8383fa6903b219b9bb 100644 (file)
--- a/gdal.spec
+++ b/gdal.spec
@@ -6,20 +6,20 @@
 Summary:       Geospatial Data Abstraction Library
 Summary(pl):   Biblioteka abstrakcji danych dotycz±cych powierzchni Ziemi
 Name:          gdal
-Version:       1.1.8
-Release:       1
+Version:       1.1.9
+Release:       2
 License:       BSD-like
 Group:         Libraries
 Source0:       ftp://ftp.remotesensing.org/pub/gdal/%{name}-%{version}.tar.gz
-# Source0-md5: e6f02c0ba706b7387203e8b4ef03945b
-Patch0:                %{name}-acfix.patch
-Patch1:                %{name}-pgsql.patch
-Patch2:                %{name}-DESTDIR.patch
-Patch3:                %{name}-soname.patch
-Patch4:                %{name}-xerces.patch
+# Source0-md5: 2183e206affc7bf25e0d33459ccb8572
+Patch0:                %{name}-pgsql.patch
+Patch1:                %{name}-DESTDIR.patch
+Patch2:                %{name}-soname.patch
+Patch3:                %{name}-xerces.patch
 URL:           http://www.remotesensing.org/gdal/
 BuildRequires: autoconf
 BuildRequires: cfitsio-devel
+BuildRequires: doxygen
 BuildRequires: hdf-devel >= 4.0
 BuildRequires: jasper-devel
 BuildRequires: libgeotiff-devel
@@ -43,7 +43,7 @@ single abstract data model to the calling application for all
 supported formats. The related OGR library (which lives within the
 GDAL source tree) provides a similar capability for simple features
 vector data.
-           
+
 %description -l pl
 GDAL to biblioteka konwertuj±ca miêdzy formatami rastrowych danych
 dotycz±cych powierzchni Ziemi, udostêpniona na licencji Open Source.
@@ -56,7 +56,7 @@ mo
 Summary:       GDAL library header files
 Summary(pl):   Pliki nag³ówkowe biblioteki GDAL
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description devel
 GDAL library header files.
@@ -68,7 +68,7 @@ Pliki nag
 Summary:       GDAL static libraries
 Summary(pl):   Statyczne biblioteki GDAL
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 GDAL static libraries.
@@ -80,7 +80,7 @@ Statyczne biblioteki GDAL.
 Summary:       GDAL Python module
 Summary(pl):   Modu³ Pythona GDAL
 Group:         Libraries/Python
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description -n python-gdal
 GDAL Python module.
@@ -94,11 +94,13 @@ Modu
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+
+%{__perl} -pi -e "s@lib/python@%{_lib}/python@" aclocal.m4
 
 %build
 %{__autoconf}
 %configure \
+       --with-pymoddir=%{py_sitedir} \
        --with-xerces \
        --with-xerces-inc=/usr/include/xercesc \
        --with-xerces-lib="-lxerces-c" \
@@ -106,10 +108,15 @@ Modu
 
 %{__make}
 
+%{__make} docs
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+
+mv -f ogr/html html/org
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -119,13 +126,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog NEWS html/*.{html,gif,png,css}
+%doc ChangeLog NEWS
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/libgdal.*.so
 %{_datadir}/gdal
 
 %files devel
 %defattr(644,root,root,755)
+%doc html/*
 %attr(755,root,root) %{_libdir}/libgdal.so
 %{_includedir}/*.h