diff --git a/gdal.spec b/gdal.spec index af947d6..1848e39 100644 --- a/gdal.spec +++ b/gdal.spec @@ -1,6 +1,6 @@ Name: gdal Version: 1.5.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: GIS file format library Group: System Environment/Libraries License: MIT @@ -183,7 +183,7 @@ export CFLAGS=`echo %{optflags}|sed -e 's/\-Wp\,\-D_FORTIFY_SOURCE\=2 / -fPIC -D --datadir=%{_datadir}/%{name}/ \ --with-threads \ --with-dods-root=%{_libdir} \ - --with-ogdi=`ogdi-config-%{cpuarch} --libdir` \ + --with-ogdi=`ogdi-config --libdir` \ --with-cfitsio=%{_prefix} \ --with-geotiff=external \ --with-tiff=external \ @@ -302,24 +302,11 @@ mv %{buildroot}%{ruby_sitearch}/%{name}/*.* %{buildroot}%{ruby_sitearch}/ rm -rf %{buildroot}%{ruby_sitearch}/%{name} # install multilib java modules in the right path -touch -r VERSION swig/java/gdal.jar +touch -r NEWS swig/java/gdal.jar mkdir -p %{buildroot}%{_javadir} cp -p swig/java/gdal.jar \ %{buildroot}%{_javadir}/%{name}-%{version}.jar -# install pkgconfig file -cat > %{name}.pc < %{buildroot}%{_includedir}/%{name}/cpl_config.h < %{name}.pc < %{buildroot}%{_bindir}/%{name}-config < - 1.5.1-12 +- fix once more gdal-config + * Tue May 27 2008 Balint Cristian - 1.5.1-11 - fix multilib gdal-config, add wrapper around - fix typos in cpl_config.h wrapper