X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgdal.git;a=blobdiff_plain;f=gdal.spec;h=fcddcc35c052b6142cad734ea72e40be43a617fe;hp=6a90bc6d8a7550468bad0e2ce80280035dac42cb;hb=cf539d541c6bf52446a03dbf1ebb0b09720f8bbf;hpb=a3027d62ffa41948720eee60a3c79fcbd94336a1

diff --git a/gdal.spec b/gdal.spec
index 6a90bc6..fcddcc3 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -1,20 +1,28 @@
+#
+# Conditional build:
+%bcond_without	odbc	# disable odbc support
+%bcond_without	xerces	# disable xerces support
+#
 Summary:	Geospatial Data Abstraction Library
-Summary(pl):	Biblioteka abstrakcji danych dotycz±cych powierzchni Ziemi
+Summary(pl.UTF-8):	Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:		gdal
-Version:	1.3.1
+Version:	1.4.1
 Release:	1
 License:	BSD-like
 Group:		Libraries
-Source0:	ftp://ftp.remotesensing.org/pub/gdal/%{name}-%{version}.tar.gz
-# Source0-md5:	7ff1ceff745ee011793e1f860c02c172
-Patch0:		%{name}-pgsql.patch
-Patch1:		%{name}-DESTDIR.patch
-Patch2:		%{name}-dods.patch
-URL:		http://www.remotesensing.org/gdal/
+#Source0:	http://download.osgeo.org/gdal/%{name}-%{version}.tar.gz
+Source0:	ftp://ftp.gdal.org/gdal/%{name}-%{version}.tar.gz
+# Source0-md5:	688cf651c6f6efc2851b12f2e9c2e0d1
+Patch0:		%{name}-dods.patch
+Patch1:		%{name}-ac.patch
+Patch2:		%{name}-perl.patch
+Patch3:		%{name}-ruby.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,15 +32,18 @@ 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:	perl-devel
 BuildRequires:	postgresql-devel
 BuildRequires:	postgresql-backend-devel
+BuildRequires:	python-Numeric-devel
 BuildRequires:	python-devel
+BuildRequires:	ruby-devel
 BuildRequires:	sqlite3-devel >= 3
-BuildRequires:	unixODBC-devel
-BuildRequires:	xerces-c-devel >= 2.2.0
+BuildRequires:	swig-ruby
+%{?with_odbc:BuildRequires:	unixODBC-devel}
+%{?with_xerces:BuildRequires:	xerces-c-devel >= 2.2.0}
 BuildRequires:	zlib-devel >= 1.1.4
 Requires:	geos >= 2.0
 Requires:	libgeotiff >= 1.2.1
@@ -48,21 +59,22 @@ 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.
-Jako biblioteka udostêpnia aplikacjom jeden abstrakcyjny model danych
-do wszystkich obs³ugiwanych formatów. Powi±zana z ni± biblioteka OGR
-(której ¼ród³a s± do³±czone do drzewa ¼róde³ GDAL) daje podobne
-mo¿liwo¶ci dla danych wektorowych.
+%description -l pl.UTF-8
+GDAL to biblioteka konwertująca między formatami rastrowych danych
+dotyczących powierzchni Ziemi, udostępniona na licencji Open Source.
+Jako biblioteka udostępnia aplikacjom jeden abstrakcyjny model danych
+do wszystkich obsługiwanych formatów. Powiązana z nią biblioteka OGR
+(której źródła są dołączone do drzewa źródeł GDAL) daje podobne
+możliwości dla danych wektorowych.
 
 %package devel
 Summary:	GDAL library header files
-Summary(pl):	Pliki nag³ówkowe biblioteki GDAL
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki GDAL
 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,35 +84,47 @@ 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
 Requires:	sqlite3-devel >= 3
-Requires:	unixODBC-devel
-Requires:	xerces-c-devel >= 2.2.0
+%{?with_odbc:Requires:	unixODBC-devel}
+%{?with_xerces:Requires:	xerces-c-devel >= 2.2.0}
 
 %description devel
 GDAL library header files.
 
-%description devel -l pl
-Pliki nag³ówkowe biblioteki GDAL.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki GDAL.
 
 %package static
 Summary:	GDAL static libraries
-Summary(pl):	Statyczne biblioteki GDAL
+Summary(pl.UTF-8):	Statyczne biblioteki GDAL
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 GDAL static libraries.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Statyczne biblioteki GDAL.
 
+%package -n perl-gdal
+Summary:	Perl bindings for GDAL
+Summary(pl.UTF-8):	Wiązania Perla do pakietu GDAL
+Group:		Development/Languages/Perl
+Requires:	%{name} = %{version}-%{release}
+
+%description -n perl-gdal
+Perl bindings for GDAL - Geo::GDAL, Geo::OGR and Geo::OSR modules.
+
+%description -n perl-gdal -l pl.UTF-8
+Wiązania Perla do pakietu GDAL - moduły Geo::GDAL, Geo::OGR,
+Geo::OSR.
+
 %package -n python-gdal
 Summary:	GDAL Python module
-Summary(pl):	Modu³ Pythona GDAL
+Summary(pl.UTF-8):	Moduł Pythona GDAL
 Group:		Libraries/Python
 Requires:	%{name} = %{version}-%{release}
 %pyrequires_eq	python-libs
@@ -108,16 +132,29 @@ Requires:	%{name} = %{version}-%{release}
 %description -n python-gdal
 GDAL Python module.
 
-%description -n python-gdal -l pl
-Modu³ Pythona GDAL.
+%description -n python-gdal -l pl.UTF-8
+Moduł Pythona GDAL.
+
+%package -n ruby-gdal
+Summary:	Ruby bindings for GDAL
+Summary(pl.UTF-8):	Wiązania języka Ruby do pakietu GDAL
+Group:		Development/Languages
+Requires:	%{name} = %{version}-%{release}
+%{?ruby_mod_ver_requires_eq}
+
+%description -n ruby-gdal
+Ruby bindings for GDAL - gdal, gdalconst, ogr and osr modules.
+
+%description -n ruby-gdal -l pl.UTF-8
+Wiązania języka Ruby do pakietu GDAL - moduły gdal, gdalconst, ogr
+i osr.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-
-%{__perl} -pi -e "s@lib/python@%{_lib}/python@" aclocal.m4
+%patch3 -p1
 
 %build
 # disable grass/libgrass here, it can be built from separate gdal-grass package
@@ -125,16 +162,22 @@ Modu
 %configure \
 	--datadir=%{_datadir}/gdal \
 	--with-dods-root=/usr \
+	--with-perl \
 	--with-pymoddir=%{py_sitedir} \
+	--with-ruby \
 	--with-sqlite \
-	--with-xerces \
+	%{?with_xerces:--with-xerces} \
 	--with-xerces-inc=/usr/include/xercesc \
 	--with-xerces-lib="-lxerces-c" \
 	--without-grass \
 	--without-libgrass
-
+# --with-ngpython disables traditional python binding
+# --with-php needs Zend API update
 %{__make}
 
+%{__make} -C swig build \
+	OPTIMIZE="%{rpmcflags}"
+
 %{__make} docs
 
 %install
@@ -145,6 +188,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 +201,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 +220,39 @@ rm -rf $RPM_BUILD_ROOT
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libgdal.a
+
+%files -n perl-gdal
+%defattr(644,root,root,755)
+%dir %{perl_vendorarch}/Geo
+%{perl_vendorarch}/Geo/GDAL.pm
+%dir %{perl_vendorarch}/Geo/GDAL
+%{perl_vendorarch}/Geo/GDAL/Const.pm
+%{perl_vendorarch}/Geo/OGR.pm
+%{perl_vendorarch}/Geo/OSR.pm
+%dir %{perl_vendorarch}/auto/Geo
+%dir %{perl_vendorarch}/auto/Geo/GDAL
+%{perl_vendorarch}/auto/Geo/GDAL/GDAL.bs
+%attr(755,root,root) %{perl_vendorarch}/auto/Geo/GDAL/GDAL.so
+%dir %{perl_vendorarch}/auto/Geo/GDAL/Const
+%{perl_vendorarch}/auto/Geo/GDAL/Const/Const.bs
+%attr(755,root,root) %{perl_vendorarch}/auto/Geo/GDAL/Const/Const.so
+%dir %{perl_vendorarch}/auto/Geo/OGR
+%{perl_vendorarch}/auto/Geo/OGR/OGR.bs
+%attr(755,root,root) %{perl_vendorarch}/auto/Geo/OGR/OGR.so
+%dir %{perl_vendorarch}/auto/Geo/OSR
+%{perl_vendorarch}/auto/Geo/OSR/OSR.bs
+%attr(755,root,root) %{perl_vendorarch}/auto/Geo/OSR/OSR.so
 
 %files -n python-gdal
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/_gdalmodule.so
-%{py_sitedir}/*.py
+%{py_sitedir}/*.py[co]
+
+%files -n ruby-gdal
+%defattr(644,root,root,755)
+%dir %{ruby_sitearchdir}/gdal
+%attr(755,root,root) %{ruby_sitearchdir}/gdal/gdal.so
+%attr(755,root,root) %{ruby_sitearchdir}/gdal/gdalconst.so
+%attr(755,root,root) %{ruby_sitearchdir}/gdal/ogr.so
+%attr(755,root,root) %{ruby_sitearchdir}/gdal/osr.so