X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgdal.git;a=blobdiff_plain;f=gdal.spec;h=245ea32b8115d033ad3d87ec145f1ce47fdb473b;hp=84a8b797056b86bbfc5132214fdfc0a577d32c95;hb=5014b82a3a721a925e2421964c7f8003be255202;hpb=6b59fa88c58c88db2786ae975d52a0d84608a41a

diff --git a/gdal.spec b/gdal.spec
index 84a8b79..245ea32 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -6,19 +6,18 @@
 Summary:	Geospatial Data Abstraction Library
 Summary(pl):	Biblioteka abstrakcji danych dotycz±cych powierzchni Ziemi
 Name:		gdal
-Version:	1.1.8
+Version:	1.2.0
 Release:	1
 License:	BSD-like
 Group:		Libraries
 Source0:	ftp://ftp.remotesensing.org/pub/gdal/%{name}-%{version}.tar.gz
-Patch0:		%{name}-acfix.patch
-Patch1:		%{name}-pgsql.patch
-Patch2:		%{name}-DESTDIR.patch
-Patch3:		%{name}-soname.patch
-Patch4:		%{name}-xerces.patch
+# Source0-md5:	7882b50cfe4c991d0ab9f89542a1767d
+Patch0:		%{name}-pgsql.patch
+Patch1:		%{name}-DESTDIR.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
@@ -31,7 +30,7 @@ BuildRequires:	postgresql-devel
 BuildRequires:	postgresql-backend-devel
 BuildRequires:	python-devel
 BuildRequires:	rpm-pythonprov
-BuildRequires:	xerces-c-devel = 1.7.0
+BuildRequires:	xerces-c-devel >= 2.2.0
 BuildRequires:	zlib-devel >= 1.1.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -42,7 +41,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.
@@ -55,7 +54,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.
@@ -67,7 +66,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.
@@ -79,7 +78,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.
@@ -91,24 +90,32 @@ Modu
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
+%{__perl} -pi -e "s@lib/python@%{_lib}/python@" aclocal.m4
 
 %build
 %{__autoconf}
 %configure \
+	--datadir=%{_datadir}/gdal \
+	--with-pymoddir=%{py_sitedir} \
 	--with-xerces \
 	--with-xerces-inc=/usr/include/xercesc \
-	--with-xerces-lib="-lxerces-c1_7_0" \
+	--with-xerces-lib="-lxerces-c" \
 	--without-grass
 
 %{__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
+
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -118,15 +125,22 @@ 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
+%exclude %{_bindir}/gdal-config
+%attr(755,root,root) %{_libdir}/libgdal.so.*.*.*
 %{_datadir}/gdal
+%{_mandir}/man1/*
+%exclude %{_mandir}/man1/gdal-config.1*
 
 %files devel
 %defattr(644,root,root,755)
+%doc html/*
+%attr(755,root,root) %{_bindir}/gdal-config
 %attr(755,root,root) %{_libdir}/libgdal.so
+%{_libdir}/libgdal.la
 %{_includedir}/*.h
+%{_mandir}/man1/gdal-config.1*
 
 %files static
 %defattr(644,root,root,755)