From a984b27e0083d005c9acc27b83faaa944cbddb63 Mon Sep 17 00:00:00 2001 From: Balint Cristian Date: Mar 15 2007 14:55:43 +0000 Subject: auto-import gdal-1.4.0-15 on branch devel from gdal-1.4.0-15.src.rpm --- diff --git a/gdal.pc b/gdal.pc deleted file mode 100644 index 9046ec1..0000000 --- a/gdal.pc +++ /dev/null @@ -1,10 +0,0 @@ -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 09d3ba5..87edeaa 100644 --- a/gdal.spec +++ b/gdal.spec @@ -1,15 +1,14 @@ Name: gdal Version: 1.4.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: GIS file format library Group: System Environment/Libraries License: MIT URL: http://gdal.maptools.org -Source0: %{name}-%{version}-fedora.tar.gz -Source1: %{name}.pc +Source: %{name}-%{version}-fedora.tar.gz Patch0: %{name}-buildfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libtool swig +BuildRequires: libtool swig pkgconfig BuildRequires: doxygen tetex-latex ghostscript BuildRequires: libpng-devel libungif-devel libjpeg-devel libtiff-devel BuildRequires: unixODBC-devel mysql-devel sqlite-devel postgresql-devel zlib-devel @@ -26,6 +25,7 @@ The GDAL library provides support to handle multiple GIS file formats. %package devel Summary: Development Libraries for the GDAL file format library Group: Development/Libraries +Requires: pkgconfig Requires: %{name} = %{version}-%{release} %description devel @@ -181,8 +181,21 @@ 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 +cat > %{name}.pc < 1.4.0-15 +- require pkgconfig +- generate pkgconfig from spec instead + * Thu Mar 15 2007 Balint Cristian 1.4.0-14 - require perl(ExtUtils::MakeMaker) instead ?dist checking - add pkgconfig file