From f2b24b9e118e539cfb79a1540acce02c6277f9e2 Mon Sep 17 00:00:00 2001 From: Balint Cristian Date: Thu, 18 Mar 2010 08:21:12 +0000 Subject: [PATCH] - fix bz#555480 - enable cairo --- import.log | 1 + mapserver.spec | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/import.log b/import.log index 62ead3c..d2bdc6a 100644 --- a/import.log +++ b/import.log @@ -7,3 +7,4 @@ mapserver-5_2_1-3_fc11:HEAD:mapserver-5.2.1-3.fc11.src.rpm:1230991877 mapserver-5_2_1-4_fc11:HEAD:mapserver-5.2.1-4.fc11.src.rpm:1233239503 mapserver-5_2_1-5_fc11:HEAD:mapserver-5.2.1-5.fc11.src.rpm:1233840826 mapserver-5_2_1-6_fc11:HEAD:mapserver-5.2.1-6.fc11.src.rpm:1234369994 +mapserver-5_6_1-2_fc13:HEAD:mapserver-5.6.1-2.fc13.src.rpm:1268900420 diff --git a/mapserver.spec b/mapserver.spec index ea33113..07e9183 100644 --- a/mapserver.spec +++ b/mapserver.spec @@ -1,6 +1,6 @@ Name: mapserver Version: 5.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Environment for building spatially-enabled internet applications Group: Development/Tools License: BSD @@ -15,7 +15,7 @@ BuildRequires: httpd-devel php-devel libxslt-devel pam-devel BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: postgresql-devel mysql-devel java-1.6.0-openjdk-devel BuildRequires: java-devel swig > 1.3.24 java java-1.5.0-gcj-devel -BuildRequires: geos-devel proj-devel gdal-devel agg-devel +BuildRequires: geos-devel proj-devel gdal-devel agg-devel cairo-devel BuildRequires: php-devel freetype-devel gd-devel >= 2.0.16 BuildRequires: python-devel curl-devel zlib-devel libxml2-devel BuildRequires: libjpeg-devel libpng-devel libtiff-devel fribidi-devel @@ -113,6 +113,7 @@ mapscript/java/examples/QueryByAttributeUnicode.java --with-gdal=%{_bindir}/gdal-config \ --with-ogr=%{_bindir}/gdal-config \ --with-geos=%{_bindir}/geos-config \ + --with-cairo=yes \ --with-proj \ --with-wfs \ --with-wcs \ @@ -132,6 +133,11 @@ mapscript/java/examples/QueryByAttributeUnicode.java --enable-debug \ --disable-runpath +# disable pgport library lookup. +for makefile in `find . -type f -name 'Makefile'`; do +sed -i 's|-lpgport||g' $makefile +done + # WARNING !!! # using %{?_smp_mflags} may break build @@ -239,6 +245,10 @@ rm -rf %{buildroot} %{_javadir}/*.jar %changelog +* Thu Mar 18 2010 Balint Cristian - 5.6.1-2 +- fix bz#555480 +- enable cairo + * Sun Jan 10 2010 Devrim GUNDUZ - 5.6.1-1 - Update to 5.6.1, for various fixes described at: http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-1/mapserver/HISTORY.TXT