[mapserver/el5] Update to 5.6.8, for various fixes described at:

Pavel Lisý pali at fedoraproject.org
Fri Oct 12 09:30:57 UTC 2012 

commit d163cc5e3831dd64192f781e3251d954fa39344d
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Fri Oct 12 11:30:34 2012 +0200

    Update to 5.6.8, for various fixes described at:
    
      http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-8/mapserver/HISTORY.TXT
    - Merged from 5.6.5-6

 .gitignore     |    2 +
 mapserver.spec |   67 +++++++++++++++++++++++++++++++++++++++++--------------
 sources        |    4 +--
 3 files changed, 53 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 448cae3..4ac7b54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ mapserver-5.2.2.tar.gz
 mapserver-5.4.0.tar.gz
 mapserver-4.10.4.tar.gz
 mapserver-4.10.5.tar.gz
+mapserver-5.6.8.tar.gz
+clog
diff --git a/mapserver.spec b/mapserver.spec
index 7669a1a..7e887f8 100644
--- a/mapserver.spec
+++ b/mapserver.spec
@@ -1,5 +1,5 @@
 Name:           mapserver
-Version:        4.10.5
+Version:        5.6.8
 Release:        1%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
@@ -7,17 +7,19 @@ License:        BSD
 URL:            http://mapserver.gis.umn.edu
 Source:         http://download.osgeo.org/mapserver/mapserver-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       httpd 
-BuildRequires:  libXpm-devel
-BuildRequires:  httpd-devel php-devel
-BuildRequires:  postgresql-devel mysql-devel
-BuildRequires:  geos-devel proj-devel gdal-devel
+Requires:       httpd
+Requires:       bitstream-vera-sans-fonts
+
+BuildRequires:  libXpm-devel readline-devel
+BuildRequires:  httpd-devel php-devel libxslt-devel pam-devel fcgi-devel
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  postgresql-devel mysql-devel java-1.6.0-openjdk-devel
+BuildRequires:  java-devel swig > 1.3.24 java
+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
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  java-gcj-compat-devel swig > 1.3.24
-BuildRequires:	byacc, flex
+BuildRequires:  libjpeg-devel libpng-devel libtiff-devel fribidi-devel
+
 
 %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
@@ -41,6 +43,7 @@ the PHP scripting language.
 Summary:        Perl/Mapscript map making extensions to Perl
 Group:          Development/Languages
 Requires:       %{name} = %{version}-%{release}
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description perl
 The Perl/Mapscript extension provides full map customization capabilities
@@ -69,17 +72,34 @@ within the Java programming language.
 %setup -q
 # fix spurious perm bits
 chmod -x tests/home.png
-chmod -x rfc/ms-rfc-8.txt
 chmod -x mapscript/php3/php_mapscript.c
 chmod -x mappluginlayer.c
 chmod -x mapscript/php3/mapscript_i.c
 chmod -x mapscript/php3/examples/test_writeshape.phtml
 chmod -x mapscript/python/examples/*.py
+chmod -x mapscript/python/tests/rundoctests.dist
 chmod -x mapscript/perl/examples/*.pl
 chmod -x mapscript/php3/README
 
+
+# remove fonts
+# alias as symlinks
+rm -rf tests/vera/Vera.ttf
+rm -rf tests/vera/VeraBd.ttf
+pushd tests/vera/
+ln -sf /usr/share/fonts/bitstream-vera/Vera.ttf Vera.ttf
+ln -sf /usr/share/fonts/bitstream-vera/VeraBd.ttf VeraBd.ttf
+popd
+
 %build
 
+# fix a UTF-8 one
+iconv -f ISO-8859-1 -t UTF-8 < \
+mapscript/java/examples/QueryByAttributeUnicode.java > \
+mapscript/java/examples/QueryByAttributeUnicode-tmp.java
+mv -f mapscript/java/examples/QueryByAttributeUnicode-tmp.java \
+mapscript/java/examples/QueryByAttributeUnicode.java
+
 # fix gdal lookup
 %{__sed} -i.libs -e 's|`\$GDAL_CONFIG --dep-libs`||' configure
 
@@ -87,14 +107,17 @@ chmod -x mapscript/php3/README
    --with-gd \
    --with-zlib \
    --with-tiff \
+   --with-agg \
+   --with-experimental-png \
    --with-freetype=%{_bindir}/freetype-config \
    --with-gdal=%{_bindir}/gdal-config \
    --with-ogr=%{_bindir}/gdal-config \
    --with-geos=%{_bindir}/geos-config \
+   --with-cairo=yes \
    --with-proj \
-   --with-sos \
    --with-wfs \
    --with-wcs \
+   --with-sos \
    --with-wmsclient \
    --with-wfsclient \
    --with-xpm \
@@ -103,12 +126,19 @@ chmod -x mapscript/php3/README
    --with-curl-config=%{_bindir}/curl-config \
    --with-xml2-config=%{_bindir}/xml2-config \
    --with-php=`php-config --include-dir` \
+   --with-fribidi-config=%{_libdir}/pkgconfig/fribidi.pc \
+   --with-fastcgi=/usr \
    --without-pdf \
    --without-eppl \
    --with-threads \
    --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
 
@@ -125,8 +155,8 @@ python setup.py build
 
 # build java
 cd ../java
-make interface
-make
+make interface JAVA_HOME=/etc/alternatives/java_sdk
+make JAVA_HOME=/etc/alternatives/java_sdk
 
 %install
 rm -rf %{buildroot}
@@ -168,8 +198,6 @@ EOF
 for junk in {*.pod,*.bs,.packlist} ; do
 find %{buildroot} -name "$junk" -exec rm -rf '{}' \;
 done
-# remove vera fonts, these are provided system wide
-rm -rf %{buildroot}/%{_docdir}/%{name}-%{version}/tests/vera
 
 # fix some exec bits
 chmod 755 %{buildroot}/%{perl_vendorarch}/auto/mapscript/mapscript.so
@@ -181,7 +209,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %doc README COMMITERS GD-COPYING HISTORY.TXT  
 %doc INSTALL MIGRATION_GUIDE.TXT
-%doc rfc symbols tests
+%doc symbols tests
 %doc fonts
 %{_bindir}/shp2img
 %{_bindir}/shptree
@@ -218,6 +246,11 @@ rm -rf %{buildroot}
 %{_javadir}/*.jar
 
 %changelog
+* Fri Oct 12 2012 Pavel Lisý <pali at fedoraproject.org> - 5.6.8-1
+- Update to 5.6.8, for various fixes described at:
+  http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-8/mapserver/HISTORY.TXT
+- Merged from 5.6.5-6
+
 * Mon Aug 31 2009 Devrim GUNDUZ <devrim at gunduz.org> 4.10.5-1
 - Update to 4.10.5, which re-fixes CVE-2009-0840.
 
diff --git a/sources b/sources
index 70c0e02..a2b2c0e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-5e36e2d788599505590501c981eb44a7  mapserver-4.10.2.tar.gz
-bde51fbe3f2218f965ee512ecba675e3  mapserver-4.10.4.tar.gz
-4c7e84b69ca57ed755cf268e79b99dce  mapserver-4.10.5.tar.gz
+5a671141006586cd524b6b16edbdb98f  mapserver-5.6.8.tar.gz

More information about the scm-commits mailing list