SPECS: gdal.spec - adapter, check-files cleanup - remove doxygen t...

[glen]

Author: glen                         Date: Tue Mar 11 20:56:53 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapter, check-files cleanup
- remove doxygen trash (*.dox); rel 3

---- Files affected:
SPECS:
   gdal.spec (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: SPECS/gdal.spec
diff -u SPECS/gdal.spec:1.52 SPECS/gdal.spec:1.53
--- SPECS/gdal.spec:1.52	Tue Mar  4 00:52:21 2008
+++ SPECS/gdal.spec	Tue Mar 11 21:56:46 2008
@@ -10,7 +10,7 @@
 Summary(pl.UTF-8):	Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:		gdal
 Version:	1.4.3
-Release:	1
+Release:	3
 License:	BSD-like
 Group:		Libraries
 Source0:	ftp://ftp.remotesensing.org/gdal/%{name}-%{version}.tar.gz
@@ -36,14 +36,14 @@
 BuildRequires:	netcdf-devel
 BuildRequires:	ogdi-devel >= 3.1
 BuildRequires:	perl-devel
-BuildRequires:	postgresql-devel
 BuildRequires:	postgresql-backend-devel
-BuildRequires:	python-numpy-devel >= 1:1.0.0
+BuildRequires:	postgresql-devel
 BuildRequires:	python-devel >= 1:2.5
+BuildRequires:	python-numpy-devel >= 1:1.0.0
 %{?with_ruby:BuildRequires:	ruby-devel}
 BuildRequires:	sqlite3-devel >= 3
-%{?with_ruby:BuildRequires:	swig-ruby}
 BuildRequires:	swig-python >= 1.3
+%{?with_ruby:BuildRequires:	swig-ruby}
 %{?with_odbc:BuildRequires:	unixODBC-devel}
 %{?with_xerces:BuildRequires:	xerces-c-devel >= 2.2.0}
 BuildRequires:	zlib-devel >= 1.1.4
@@ -121,8 +121,7 @@
 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.
+Wiązania Perla do pakietu GDAL - moduły Geo::GDAL, Geo::OGR, Geo::OSR.
 
 %package -n python-gdal
 Summary:	GDAL Python module
@@ -148,8 +147,8 @@
 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.
+Wiązania języka Ruby do pakietu GDAL - moduły gdal, gdalconst, ogr i
+osr.
 
 %prep
 %setup -q
@@ -158,6 +157,10 @@
 %patch2 -p1
 
 %build
+# $PYTHON_INCLUDES is set only with --with-python, but we have --with-ngpython,
+# and $PYTHON_INCLUDES is needed to detect numpy properly
+export PYTHON_INCLUDES=-I%{py_incdir}
+
 # disable grass/libgrass here, it can be built from separate gdal-grass package
 %{__autoconf}
 %configure \
@@ -197,6 +200,18 @@
 %py_postclean
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
 
+%{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Geo/GDAL/.packlist
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Geo/GDAL/Const/.packlist
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Geo/OGR/.packlist
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Geo/OSR/.packlist
+
+# some doxygen trash
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Geo/GDAL.dox
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Geo/GDAL/Const.dox
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Geo/OGR.dox
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Geo/OSR.dox
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -209,6 +224,7 @@
 %attr(755,root,root) %{_bindir}/*
 %exclude %{_bindir}/gdal-config
 %attr(755,root,root) %{_libdir}/libgdal.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgdal.so.1
 %{_datadir}/gdal
 %{_mandir}/man1/*
 %exclude %{_mandir}/man1/gdal-config.1*
@@ -279,6 +295,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2008-03-11 20:56:46  glen
+- adapter, check-files cleanup
+- remove doxygen trash (*.dox); rel 3
+
 Revision 1.52  2008-03-03 23:52:21  glen
 - correct numpy epoch (ARGGh)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gdal.spec?r1=1.52&r2=1.53&f=u