From 8cc62fde4063144bb028808994469b9cccc34f01 Mon Sep 17 00:00:00 2001 From: Balint Cristian Date: Thu, 15 Mar 2007 14:30:56 +0000 Subject: [PATCH] auto-import gdal-1.4.0-14 on branch devel from gdal-1.4.0-14.src.rpm --- gdal.pc | 10 ++++++++++ gdal.spec | 21 +++++++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 gdal.pc diff --git a/gdal.pc b/gdal.pc new file mode 100644 index 0000000..9046ec1 --- /dev/null +++ b/gdal.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=/usr +libdir=/usr/lib +includedir=/usr/include + +Name: GDAL +Description: GIS file format library +Version: 1.4.0 +Libs: -L${libdir} +Cflags: -I%{includedir}/gdal \ No newline at end of file diff --git a/gdal.spec b/gdal.spec index f781190..09d3ba5 100644 --- a/gdal.spec +++ b/gdal.spec @@ -1,11 +1,12 @@ Name: gdal Version: 1.4.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: GIS file format library Group: System Environment/Libraries License: MIT URL: http://gdal.maptools.org -Source: %{name}-%{version}-fedora.tar.gz +Source0: %{name}-%{version}-fedora.tar.gz +Source1: %{name}.pc Patch0: %{name}-buildfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool swig @@ -15,12 +16,7 @@ BuildRequires: unixODBC-devel mysql-devel sqlite-devel postgresql-devel zlib-dev BuildRequires: proj-devel geos-devel netcdf-devel hdf5-devel ogdi-devel BuildRequires: jasper-devel cfitsio-devel hdf-devel libdap-devel librx-devel BuildRequires: python-devel >= 2.4 xerces-c-devel - -%if "%{?dist}" == ".fc7" -BuildRequires: perl-devel >= 5.8 -%elseif -BuildRequires: perl -%endif +BuildRequires: perl(ExtUtils::MakeMaker) %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") @@ -184,6 +180,10 @@ rm -rf %{buildroot}%{perl_vendorarch}/Geo/GDAL mv %{buildroot}%{perl_sitearch}/auto/Geo/* %{buildroot}%{perl_vendorarch}/Geo/ rm -rf %{buildroot}%{_libdir}/perl5/site_perl %{buildroot}/auto %{buildroot}%{perl_sitelib} +# install pkgconfig file +mkdir -p %{buildroot}%{_libdir}/pkgconfig/ +install -p -m 644 %{SOURCE1} %{buildroot}%{_libdir}/pkgconfig/ + # fix some exec bits find %{buildroot}%{perl_vendorarch} -name "*.so" -exec chmod 755 '{}' \; chmod -x pymod/samples/* @@ -243,6 +243,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/%{name}-config %{_includedir}/%{name}/*.h %{_libdir}/*.so +%{_libdir}/pkgconfig/%{name}.pc %{_mandir}/man1/%{name}-config* %files python @@ -262,6 +263,10 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorarch}/* %changelog +* Thu Mar 15 2007 Balint Cristian 1.4.0-14 +- require perl(ExtUtils::MakeMaker) instead ?dist checking +- add pkgconfig file + * Wed Mar 14 2007 Balint Cristian 1.4.0-13 - fix typo in specfile