rpms/gdal/FC-6 gdal.spec,1.1,1.2
Balint Cristian (cbalint)
fedora-extras-commits at redhat.com
Thu Mar 15 14:57:43 UTC 2007
Author: cbalint
Update of /cvs/extras/rpms/gdal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29421/FC-6
Modified Files:
gdal.spec
Log Message:
auto-import gdal-1.4.0-15 on branch FC-6 from gdal-1.4.0-15.src.rpm
Index: gdal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdal/FC-6/gdal.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdal.spec 14 Mar 2007 17:27:55 -0000 1.1
+++ gdal.spec 15 Mar 2007 14:57:10 -0000 1.2
@@ -1,6 +1,6 @@
Name: gdal
Version: 1.4.0
-Release: 13%{?dist}
+Release: 15%{?dist}
Summary: GIS file format library
Group: System Environment/Libraries
License: MIT
@@ -8,19 +8,14 @@
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
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)")
@@ -30,6 +25,7 @@
%package devel
Summary: Development Libraries for the GDAL file format library
Group: Development/Libraries
+Requires: pkgconfig
Requires: %{name} = %{version}-%{release}
%description devel
@@ -184,6 +180,23 @@
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 <<EOF
+prefix=%{_prefix}
+exec_prefix=%{_prefix}
+libdir=%{_libdir}
+includedir=%{_includedir}
+
+Name: GDAL
+Description: GIS file format library
+Version: %{version}
+Libs: -L\${libdir}
+Cflags: -I\${includedir}/%{name}
+EOF
+
+mkdir -p %{buildroot}%{_libdir}/pkgconfig/
+install -p -m 644 %{name}.pc %{buildroot}%{_libdir}/pkgconfig/
+
# fix some exec bits
find %{buildroot}%{perl_vendorarch} -name "*.so" -exec chmod 755 '{}' \;
chmod -x pymod/samples/*
@@ -243,6 +256,7 @@
%{_bindir}/%{name}-config
%{_includedir}/%{name}/*.h
%{_libdir}/*.so
+%{_libdir}/pkgconfig/%{name}.pc
%{_mandir}/man1/%{name}-config*
%files python
@@ -262,6 +276,14 @@
%{perl_vendorarch}/*
%changelog
+* Thu Mar 15 2007 Balint Cristian <cbalint at redhat.com> 1.4.0-15
+- require pkgconfig
+- generate pkgconfig from spec instead
+
+* Thu Mar 15 2007 Balint Cristian <cbalint at redhat.com> 1.4.0-14
+- require perl(ExtUtils::MakeMaker) instead ?dist checking
+- add pkgconfig file
+
* Wed Mar 14 2007 Balint Cristian <cbalint at redhat.com> 1.4.0-13
- fix typo in specfile
More information about the fedora-extras-commits
mailing list