Update to 7.0.1
This commit is contained in:
parent
56524af25a
commit
5e46839a60
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,3 +6,4 @@
|
||||
/mapserver62-6.2.0-python-62.patch
|
||||
/mapserver-6.2.1.tar.gz
|
||||
/mapserver-6.2.2.tar.gz
|
||||
/mapserver-6ae2bc6915d73417f4fea78201d4f7087c25b3f1.tar.gz
|
||||
|
@ -1,12 +0,0 @@
|
||||
--- mapserver-6.2.1/configure.gdver 2013-04-20 06:08:49.000000000 +0200
|
||||
+++ mapserver-6.2.1/configure 2013-06-11 10:51:24.478483434 +0200
|
||||
@@ -17135,7 +17135,8 @@
|
||||
|
||||
|
||||
|
||||
- if test $GDMAJOR -lt 2 -o $GDMINOR -lt 0 -o $GDREV -lt 28 ; then
|
||||
+ GDNUM=`expr ${GDMAJOR}0000 + ${GDMINOR}00 + ${GDREV}`
|
||||
+ if test $GDNUM -lt 20028 ; then
|
||||
as_fn_error $? "GD version $GDVERSION too old. need at least 2.0.28" "$LINENO" 5
|
||||
fi
|
||||
|
@ -1,85 +0,0 @@
|
||||
From fc99472b8b2fc837148f71755f23349a71e307bf Mon Sep 17 00:00:00 2001
|
||||
From: Bas Couwenberg <sebastic@xs4all.nl>
|
||||
Date: Sat, 26 Apr 2014 13:46:41 +0200
|
||||
Subject: [PATCH] Use php://input instead of raw_post_data to support PHP 5.6.
|
||||
|
||||
php_stream handling largely taken from PECL HTTP:
|
||||
|
||||
http://git.php.net/?p=pecl/http/pecl_http.git;a=blob;f=php_http_env.c;h=30ee32d7c68b3341aeaeb24c909b102537caccdf;hb=8ec2c825719482e62222163a300b0e18319591d0#l229
|
||||
|
||||
Copyright (c) 2004-2014, Michael Wallner <mike@iworks.at>.
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
* Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
|
||||
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
Bug-Debian: https://bugs.debian.org/745600
|
||||
---
|
||||
.travis.yml | 1 +
|
||||
mapscript/php/owsrequest.c | 23 +++++++++++++++++++++++
|
||||
2 files changed, 24 insertions(+)
|
||||
|
||||
diff --git a/mapscript/php/owsrequest.c b/mapscript/php/owsrequest.c
|
||||
index 428c8dd..f01d361 100644
|
||||
--- a/mapscript/php/owsrequest.c
|
||||
+++ b/mapscript/php/owsrequest.c
|
||||
@@ -32,6 +32,9 @@
|
||||
#include "php_mapscript.h"
|
||||
#include "SAPI.h"
|
||||
#include "php_variables.h"
|
||||
+#if PHP_VERSION_ID >= 50600
|
||||
+#include "php_streams.h"
|
||||
+#endif
|
||||
|
||||
char *owsrequest_getenv(const char *name, void *thread_context);
|
||||
|
||||
@@ -193,9 +196,29 @@ PHP_METHOD(OWSRequestObj, loadParams)
|
||||
cgirequestObj_loadParams(php_owsrequest->cgirequest, owsrequest_getenv, NULL, 0, thread_context);
|
||||
}
|
||||
} else {
|
||||
+#if PHP_VERSION_ID >= 50600
|
||||
+ php_stream *s = php_stream_temp_new();
|
||||
+ php_stream *input = php_stream_open_wrapper("php://input", "r", 0, NULL);
|
||||
+
|
||||
+ /* php://input does not support stat */
|
||||
+ php_stream_copy_to_stream_ex(input, s, -1, NULL);
|
||||
+ php_stream_close(input);
|
||||
+
|
||||
+ php_stream_rewind(s);
|
||||
+
|
||||
+ char *raw_post_data = NULL;
|
||||
+ long raw_post_data_length = 0;
|
||||
+
|
||||
+ raw_post_data_length = php_stream_copy_to_mem(s, raw_post_data, -1, 0);
|
||||
+
|
||||
+ cgirequestObj_loadParams(php_owsrequest->cgirequest, owsrequest_getenv,
|
||||
+ raw_post_data,
|
||||
+ raw_post_data_length, thread_context);
|
||||
+#else
|
||||
cgirequestObj_loadParams(php_owsrequest->cgirequest, owsrequest_getenv,
|
||||
SG(request_info).raw_post_data,
|
||||
SG(request_info).raw_post_data_length, thread_context);
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
1.9.3
|
||||
|
@ -1,87 +0,0 @@
|
||||
diff -up mapserver-6.2.2/mapscript/java/javamodule.i.orig mapserver-6.2.2/mapscript/java/javamodule.i
|
||||
--- mapserver-6.2.2/mapscript/java/javamodule.i.orig 2015-02-27 10:45:48.511177981 +0100
|
||||
+++ mapserver-6.2.2/mapscript/java/javamodule.i 2015-02-27 10:47:28.167527155 +0100
|
||||
@@ -1,9 +1,11 @@
|
||||
|
||||
%include arrays_java.i
|
||||
|
||||
+/*
|
||||
# Uncomment this if you wish to hace enums wrapped in an interface compatible
|
||||
# with that generated by swig 1.3.21 (tests wont compile, though)
|
||||
#%include enumsimple.swg
|
||||
+*/
|
||||
|
||||
/* Mapscript library loader */
|
||||
|
||||
diff -up mapserver-6.2.2/mapscript/python/pyextend.i.orig mapserver-6.2.2/mapscript/python/pyextend.i
|
||||
--- mapserver-6.2.2/mapscript/python/pyextend.i.orig 2015-02-27 10:51:10.600538511 +0100
|
||||
+++ mapserver-6.2.2/mapscript/python/pyextend.i 2015-02-27 10:52:10.077343724 +0100
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
/* fromstring: Factory for mapfile objects */
|
||||
|
||||
-%pythoncode {
|
||||
+%pythoncode %{
|
||||
def fromstring(data, mappath=None):
|
||||
"""Creates map objects from mapfile strings.
|
||||
|
||||
@@ -50,7 +50,7 @@ def fromstring(data, mappath=None):
|
||||
return ob
|
||||
else:
|
||||
raise ValueError, "No map, layer, class, or style found. Can not load from provided string"
|
||||
-}
|
||||
+%}
|
||||
|
||||
/* ===========================================================================
|
||||
Python rectObj extensions
|
||||
@@ -58,12 +58,12 @@ def fromstring(data, mappath=None):
|
||||
|
||||
%extend pointObj {
|
||||
|
||||
-%pythoncode {
|
||||
+%pythoncode %{
|
||||
|
||||
def __str__(self):
|
||||
return self.toString()
|
||||
|
||||
-}
|
||||
+%}
|
||||
|
||||
}
|
||||
|
||||
@@ -74,7 +74,7 @@ def fromstring(data, mappath=None):
|
||||
|
||||
%extend rectObj {
|
||||
|
||||
-%pythoncode {
|
||||
+%pythoncode %{
|
||||
|
||||
def __str__(self):
|
||||
return self.toString()
|
||||
@@ -91,7 +91,7 @@ def fromstring(data, mappath=None):
|
||||
raise TypeError, \
|
||||
'__contains__ does not yet handle %s' % (item_type)
|
||||
|
||||
-}
|
||||
+%}
|
||||
|
||||
}
|
||||
|
||||
@@ -131,7 +131,7 @@ def fromstring(data, mappath=None):
|
||||
PyTuple_SetItem(output,1,PyInt_FromLong((long)self->height));
|
||||
return output;
|
||||
}
|
||||
-%pythoncode {
|
||||
+%pythoncode %{
|
||||
|
||||
def get_height(self):
|
||||
return self.getSize()[1] # <-- second member is the height
|
||||
@@ -144,7 +144,7 @@ def fromstring(data, mappath=None):
|
||||
width = property(get_width, set_width)
|
||||
height = property(get_height, set_height)
|
||||
|
||||
-}
|
||||
+%}
|
||||
|
||||
}
|
||||
|
@ -1,40 +0,0 @@
|
||||
--- configure.old 2015-03-14 10:56:34.129000000 +0200
|
||||
+++ configure 2015-03-14 10:56:42.996000000 +0200
|
||||
@@ -3055,7 +3055,7 @@
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
|
||||
set X $ac_compile
|
||||
ac_compiler=$2
|
||||
-for ac_option in --version -v -V -qversion; do
|
||||
+for ac_option in --version -v -V ; do
|
||||
{ { ac_try="$ac_compiler $ac_option >&5"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
@@ -11503,7 +11503,7 @@
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
|
||||
set X $ac_compile
|
||||
ac_compiler=$2
|
||||
-for ac_option in --version -v -V -qversion; do
|
||||
+for ac_option in --version -v -V ; do
|
||||
{ { ac_try="$ac_compiler $ac_option >&5"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
@@ -11851,7 +11851,7 @@
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
|
||||
set X $ac_compile
|
||||
ac_compiler=$2
|
||||
-for ac_option in --version -v -V -qversion; do
|
||||
+for ac_option in --version -v -V ; do
|
||||
{ { ac_try="$ac_compiler $ac_option >&5"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
--- mapcairo.c.old 2015-03-19 19:01:56.220000000 +0200
|
||||
+++ mapcairo.c 2015-03-19 19:02:05.592000000 +0200
|
||||
@@ -1270,7 +1270,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-inline int populateRendererVTableCairoVector( rendererVTableObj *renderer )
|
||||
+int populateRendererVTableCairoVector( rendererVTableObj *renderer )
|
||||
{
|
||||
#ifdef USE_CAIRO
|
||||
renderer->use_imagecache=0;
|
361
mapserver.spec
361
mapserver.spec
@ -1,56 +1,72 @@
|
||||
%define MS_REL %{nil}
|
||||
%if "%{php_version}" < "5.6"
|
||||
%global ini_name %{name}.ini
|
||||
%else
|
||||
%global ini_name 40-%{name}.ini
|
||||
%endif
|
||||
%global ini_name 40-mapserver.ini
|
||||
%global project_owner mapserver
|
||||
%global project_name mapserver
|
||||
%global commit 6ae2bc6915d73417f4fea78201d4f7087c25b3f1
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
|
||||
Name: mapserver%{MS_REL}
|
||||
Version: 6.2.2
|
||||
Release: 8%{?dist}
|
||||
Name: mapserver
|
||||
Version: 7.0.1
|
||||
Release: 1.git%{shortcommit}%{?dist}
|
||||
Summary: Environment for building spatially-enabled internet applications
|
||||
|
||||
Group: Development/Tools
|
||||
License: BSD
|
||||
URL: http://www.mapserver.org
|
||||
|
||||
Source0: http://download.osgeo.org/mapserver/mapserver-%{version}.tar.gz
|
||||
%if 0%{MS_REL}
|
||||
Patch0: %{name}-%{version}-java-%{MS_REL}.patch
|
||||
Patch1: %{name}-%{version}-perl-%{MS_REL}.patch
|
||||
Patch2: %{name}-%{version}-python-%{MS_REL}.patch
|
||||
%endif
|
||||
# Fix check for libgd version (to be reported upstream)
|
||||
Patch3: %{name}-6.2.1-gdver.patch
|
||||
# upstream patch for PHP 5.6
|
||||
Patch4: %{name}-6.2.1-php56.patch
|
||||
Patch5: %{name}-gcc5.patch
|
||||
Patch6: %{name}-6.2.2-swig305.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Source0: https://github.com/%{project_owner}/%{project_name}/archive/%{commit}/%{project_name}-%{commit}.tar.gz
|
||||
|
||||
Requires: httpd
|
||||
Requires: dejavu-sans-fonts
|
||||
|
||||
BuildRequires: libXpm-devel readline-devel
|
||||
BuildRequires: httpd-devel php-devel libxslt-devel pam-devel fcgi-devel
|
||||
BuildRequires: cairo-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: curl-devel
|
||||
BuildRequires: fcgi-devel
|
||||
BuildRequires: freetype-devel
|
||||
BuildRequires: fribidi-devel
|
||||
BuildRequires: gd-devel >= 2.0.16
|
||||
BuildRequires: gdal-devel
|
||||
BuildRequires: geos-devel
|
||||
BuildRequires: giflib-devel
|
||||
BuildRequires: httpd-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: libXpm-devel
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: mysql-devel
|
||||
BuildRequires: harfbuzz-devel
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: perl(ExtUtils::MakeMaker)
|
||||
BuildRequires: postgresql-devel mysql-devel java-devel
|
||||
BuildRequires: swig > 1.3.24 java
|
||||
BuildRequires: geos-devel proj-devel gdal-devel cairo-devel
|
||||
BuildRequires: 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 giflib-devel
|
||||
BuildRequires: postgresql-devel
|
||||
BuildRequires: proj-devel
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: swig
|
||||
BuildRequires: zlib-devel
|
||||
|
||||
|
||||
%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
|
||||
|
||||
%description
|
||||
Mapserver is an internet mapping program that converts GIS data to
|
||||
map images in real time. With appropriate interface pages,
|
||||
Mapserver can provide an interactive internet map based on
|
||||
map images in real time. With appropriate interface pages,
|
||||
Mapserver can provide an interactive internet map based on
|
||||
custom GIS data.
|
||||
|
||||
|
||||
%package libs
|
||||
Summary: %{summary}
|
||||
|
||||
%description libs
|
||||
This package contains the libs for mapserver.
|
||||
|
||||
|
||||
%package devel
|
||||
Summary: Development files for mapserver
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%description devel
|
||||
This package contains development files for mapserver.
|
||||
|
||||
%package -n php-%{name}
|
||||
Summary: PHP/Mapscript map making extensions to PHP
|
||||
Group: Development/Languages
|
||||
@ -77,6 +93,7 @@ within the Perl programming language.
|
||||
%package python
|
||||
Summary: Python/Mapscript map making extensions to Python
|
||||
Group: Development/Languages
|
||||
BuildRequires: python2-devel
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description python
|
||||
@ -86,6 +103,7 @@ within the Python programming language.
|
||||
%package java
|
||||
Summary: Java/Mapscript map making extensions to Java
|
||||
Group: Development/Languages
|
||||
BuildRequires: java-devel
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: java-headless
|
||||
|
||||
@ -93,23 +111,19 @@ Requires: java-headless
|
||||
The Java/Mapscript extension provides full map customization capabilities
|
||||
within the Java programming language.
|
||||
|
||||
|
||||
%package ruby
|
||||
Summary: Ruby/Mapscript map making extensions to Ruby
|
||||
BuildRequires: ruby-devel
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description ruby
|
||||
The Ruby/Mapscript extension provides full map customization capabilities within
|
||||
the ruby programming language.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n mapserver-%{version}
|
||||
%if 0%{MS_REL}
|
||||
%patch0 -p1 -b .java
|
||||
%patch1 -p1 -b .perl
|
||||
%patch2 -p1 -b .python
|
||||
%endif
|
||||
%patch3 -p1 -b .gdver
|
||||
%patch4 -p1 -b .php56
|
||||
%patch5 -p0 -b .gcc5
|
||||
%patch6 -p1 -b .swig305
|
||||
|
||||
# fix spurious perm bits
|
||||
chmod -x mapscript/python/examples/*.py
|
||||
chmod -x mapscript/python/tests/rundoctests.dist
|
||||
chmod -x mapscript/perl/examples/*.pl
|
||||
|
||||
%setup -q -n %{project_owner}-%{commit}
|
||||
|
||||
# replace fonts for tests with symlinks
|
||||
rm -rf tests/vera/Vera.ttf
|
||||
@ -122,193 +136,167 @@ popd
|
||||
# Force swig to regenerate the wrapper
|
||||
rm -rf mapscript/perl/mapscript_wrap.c
|
||||
|
||||
|
||||
%build
|
||||
|
||||
CFLAGS="${CFLAGS} -ldl -fPIC" ; export CFLAGS
|
||||
mkdir build
|
||||
cd 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
|
||||
export CFLAGS="${CFLAGS} -ldl -fPIC -fno-strict-aliasing"
|
||||
export CXXFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
|
||||
# fix gdal lookup
|
||||
%{__sed} -i.libs -e 's|`\$GDAL_CONFIG --dep-libs`||' configure
|
||||
cmake -DINSTALL_LIB_DIR=%{_libdir} \
|
||||
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
||||
-DCMAKE_SKIP_RPATH=ON \
|
||||
-DCMAKE_CXX_FLAGS_RELEASE="%{optflags} -fno-strict-aliasing" \
|
||||
-DCMAKE_C_FLAGS_RELEASE="%{optflags} -fno-strict-aliasing" \
|
||||
-DCMAKE_VERBOSE_MAKEFILE=ON \
|
||||
-DCMAKE_BUILD_TYPE="Release" \
|
||||
-DCMAKE_SKIP_INSTALL_RPATH=ON \
|
||||
-DCMAKE_SKIP_RPATH=ON \
|
||||
-DWITH_CAIRO=TRUE \
|
||||
-DWITH_CLIENT_WFS=TRUE \
|
||||
-DWITH_CLIENT_WMS=TRUE \
|
||||
-DWITH_CURL=TRUE \
|
||||
-DWITH_FCGI=TRUE \
|
||||
-DWITH_FRIBIDI=TRUE \
|
||||
-DWITH_GD=TRUE \
|
||||
-DWITH_GDAL=TRUE \
|
||||
-DWITH_GEOS=TRUE \
|
||||
-DWITH_GIF=TRUE \
|
||||
-DWITH_ICONV=TRUE \
|
||||
-DWITH_JAVA=TRUE \
|
||||
-DWITH_KML=TRUE \
|
||||
-DWITH_LIBXML2=TRUE \
|
||||
-DWITH_OGR=TRUE \
|
||||
-DWITH_MYSQL=TRUE \
|
||||
-DWITH_PERL=TRUE \
|
||||
-DCUSTOM_PERL_SITE_ARCH_DIR="%{perl_vendorarch}" \
|
||||
-DWITH_PHP=TRUE \
|
||||
-DWITH_POSTGIS=TRUE \
|
||||
-DWITH_PROJ=TRUE \
|
||||
-DWITH_PYTHON=TRUE \
|
||||
-DWITH_RUBY=TRUE \
|
||||
-DWITH_V8=FALSE \
|
||||
-DWITH_SOS=TRUE \
|
||||
-DWITH_THREAD_SAFETY=TRUE \
|
||||
-DWITH_WCS=TRUE \
|
||||
-DWITH_WMS=TRUE \
|
||||
-DWITH_WFS=TRUE \
|
||||
-DWITH_XMLMAPFILE=TRUE \
|
||||
-DWITH_POINT_Z_M=TRUE \
|
||||
-DWITH_APACHE_MODULE=FALSE \
|
||||
-DWITH_SVGCAIRO=FALSE \
|
||||
-DWITH_MYSQL=FALSE \
|
||||
-DWITH_CSHARP=FALSE \
|
||||
-DWITH_ORACLESPATIAL=FALSE \
|
||||
-DWITH_ORACLE_PLUGIN=FALSE \
|
||||
-DWITH_MSSQL2008=FALSE \
|
||||
-DWITH_SDE=FALSE \
|
||||
-DWITH_SDE_PLUGIN=FALSE \
|
||||
-DWITH_EXEMPI=FALSE \
|
||||
..
|
||||
|
||||
%configure \
|
||||
--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-wfs \
|
||||
--with-wcs \
|
||||
--with-sos \
|
||||
--with-wmsclient \
|
||||
--with-wfsclient \
|
||||
--with-xpm \
|
||||
--with-postgis=%{_bindir}/pg_config \
|
||||
--with-mygis=%{_bindir}/mysql_config \
|
||||
--with-curl-config=%{_bindir}/curl-config \
|
||||
--with-xml2-config=%{_bindir}/xml2-config \
|
||||
--with-php=%{_bindir}/php-config \
|
||||
--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
|
||||
make %{?_smp_mflags}
|
||||
|
||||
# WARNING !!!
|
||||
# using %{?_smp_mflags} may break build
|
||||
make
|
||||
|
||||
# build perl
|
||||
pushd mapscript/perl
|
||||
%if 0%{MS_REL}
|
||||
mv mapscript.pm mapscript%{MS_REL}.pm
|
||||
%endif
|
||||
perl Makefile.PL
|
||||
make DESTDIR=%{buildroot} pure_vendor_install
|
||||
popd
|
||||
|
||||
# build python
|
||||
pushd mapscript/python
|
||||
python setup.py build
|
||||
popd
|
||||
|
||||
# build java
|
||||
pushd mapscript/java
|
||||
make JAVA_HOME=/etc/alternatives/java_sdk
|
||||
popd
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
mkdir -p %{buildroot}%{_libexecdir}
|
||||
mkdir -p %{buildroot}%{php_inidir}
|
||||
mkdir -p %{buildroot}%{php_extdir}
|
||||
mkdir -p %{buildroot}/%{_bindir}
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
mkdir -p %{buildroot}%{_datadir}/%{name}
|
||||
install -p -m 755 .libs/mapserv %{buildroot}%{_libexecdir}/mapserver%{MS_REL}
|
||||
install -p -m 755 .libs/legend %{buildroot}/%{_bindir}/legend%{MS_REL}
|
||||
install -p -m 755 .libs/msencrypt %{buildroot}/%{_bindir}/msencrypt%{MS_REL}
|
||||
install -p -m 755 .libs/scalebar %{buildroot}/%{_bindir}/scalebar%{MS_REL}
|
||||
install -p -m 755 .libs/shp2img %{buildroot}/%{_bindir}/shp2img%{MS_REL}
|
||||
install -p -m 755 .libs/shptree %{buildroot}/%{_bindir}/shptree%{MS_REL}
|
||||
install -p -m 755 .libs/shptreetst %{buildroot}/%{_bindir}/shptreetst%{MS_REL}
|
||||
install -p -m 755 .libs/shptreevis %{buildroot}/%{_bindir}/shptreevis%{MS_REL}
|
||||
install -p -m 755 .libs/sortshp %{buildroot}/%{_bindir}/sortshp%{MS_REL}
|
||||
install -p -m 755 .libs/tile4ms %{buildroot}/%{_bindir}/tile4ms%{MS_REL}
|
||||
|
||||
install -p -m 755 .libs/libmapserver-%{version}.so %{buildroot}%{_libdir}/
|
||||
mkdir -p %{buildroot}%{_includedir}/%{name}/
|
||||
|
||||
install -p -m 644 xmlmapfile/mapfile.xsd %{buildroot}%{_datadir}/%{name}
|
||||
install -p -m 644 xmlmapfile/mapfile.xsl %{buildroot}%{_datadir}/%{name}
|
||||
|
||||
install -p -m 755 mapscript/php/.libs/php_mapscript-%{version}.so %{buildroot}/%{php_extdir}/php_mapscript%{MS_REL}.so
|
||||
|
||||
# install perl module
|
||||
pushd mapscript/perl
|
||||
make DESTDIR=%{buildroot} pure_vendor_install
|
||||
popd
|
||||
|
||||
# install python module
|
||||
pushd mapscript/python
|
||||
python setup.py install --root %{buildroot}
|
||||
popd
|
||||
|
||||
# install java
|
||||
mkdir -p %{buildroot}%{_javadir}
|
||||
install -p -m 644 mapscript/java/mapscript%{MS_REL}.jar %{buildroot}%{_javadir}/
|
||||
install -p -m 755 mapscript/java/.libs/libjavamapscript-%{version}.so %{buildroot}%{_libdir}/
|
||||
install -p -m 644 build/mapscript/java/mapscript.jar %{buildroot}%{_javadir}/
|
||||
|
||||
# install header
|
||||
install -p -m 644 *.h %{buildroot}%{_includedir}/%{name}/
|
||||
|
||||
cd build
|
||||
make DESTDIR=%{buildroot} install %{?_smp_mflags}
|
||||
|
||||
# install php config file
|
||||
mkdir -p %{buildroot}%{php_inidir}
|
||||
cat > %{buildroot}%{php_inidir}/%{ini_name} <<EOF
|
||||
; Enable %{name} extension module
|
||||
extension=php_mapscript%{MS_REL}.so
|
||||
extension=php_mapscript.so
|
||||
EOF
|
||||
|
||||
# cleanup junks
|
||||
for junk in {*.pod,*.bs,.packlist} ; do
|
||||
find %{buildroot} -name "$junk" -exec rm -rf '{}' \;
|
||||
done
|
||||
|
||||
# fix some exec bits
|
||||
chmod 755 %{buildroot}%{perl_vendorarch}/auto/mapscript%{MS_REL}/mapscript%{MS_REL}.so
|
||||
%post libs -p /sbin/ldconfig
|
||||
%post devel -p /sbin/ldconfig
|
||||
|
||||
|
||||
%check
|
||||
: Minimal load test for PHP extension
|
||||
%{_bindir}/php \
|
||||
-n -d extension=%{buildroot}%{php_extdir}/php_mapscript%{MS_REL}.so \
|
||||
-m | grep MapScript
|
||||
%postun libs -p /sbin/ldconfig
|
||||
%postun devel -p /sbin/ldconfig
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc README COMMITERS GD-COPYING HISTORY.TXT
|
||||
%doc INSTALL MIGRATION_GUIDE.txt
|
||||
%doc symbols tests
|
||||
%doc fonts
|
||||
%{_bindir}/legend%{MS_REL}
|
||||
%{_bindir}/msencrypt%{MS_REL}
|
||||
%{_bindir}/scalebar%{MS_REL}
|
||||
%{_bindir}/shp2img%{MS_REL}
|
||||
%{_bindir}/shptree%{MS_REL}
|
||||
%{_bindir}/shptreetst%{MS_REL}
|
||||
%{_bindir}/shptreevis%{MS_REL}
|
||||
%{_bindir}/sortshp%{MS_REL}
|
||||
%{_bindir}/tile4ms%{MS_REL}
|
||||
%{_libdir}/libmapserver-%{version}.so
|
||||
%{_libexecdir}/%{name}
|
||||
%dir %{_datadir}/%{name}
|
||||
%{_datadir}/%{name}/*
|
||||
%doc README
|
||||
%{_bindir}/legend
|
||||
%{_bindir}/mapserv
|
||||
%{_bindir}/msencrypt
|
||||
%{_bindir}/scalebar
|
||||
%{_bindir}/shp2img
|
||||
%{_bindir}/shptree
|
||||
%{_bindir}/shptreetst
|
||||
%{_bindir}/shptreevis
|
||||
%{_bindir}/sortshp
|
||||
%{_bindir}/tile4ms
|
||||
%{_datadir}/%{name}/
|
||||
|
||||
%files libs
|
||||
%doc README
|
||||
%{_libdir}/libmapserver.so.%{version}
|
||||
%{_libdir}/libmapserver.so.2
|
||||
|
||||
%files devel
|
||||
%doc README
|
||||
%{_libdir}/libmapserver.so
|
||||
%{_includedir}/%{name}/
|
||||
|
||||
%files -n php-%{name}
|
||||
%defattr(-,root,root)
|
||||
%doc mapscript/php/README
|
||||
%doc mapscript/php/examples
|
||||
%config(noreplace) %{php_inidir}/%{ini_name}
|
||||
%{php_extdir}/php_mapscript%{MS_REL}.so
|
||||
%{php_extdir}/php_mapscript.so*
|
||||
|
||||
%files perl
|
||||
%defattr(-,root,root)
|
||||
%doc README
|
||||
%doc mapscript/perl/examples
|
||||
%dir %{perl_vendorarch}/auto/mapscript%{MS_REL}
|
||||
%{perl_vendorarch}/auto/mapscript%{MS_REL}/*
|
||||
%{perl_vendorarch}/mapscript%{MS_REL}.pm
|
||||
%dir %{perl_vendorarch}/auto/mapscript
|
||||
%{perl_vendorarch}/auto/mapscript/*
|
||||
%{perl_vendorarch}/mapscript.pm
|
||||
|
||||
%files python
|
||||
%defattr(-,root,root)
|
||||
%doc mapscript/python/README
|
||||
%doc mapscript/python/examples
|
||||
%doc mapscript/python/tests
|
||||
%{python_sitearch}/*
|
||||
%{python2_sitearch}/*mapscript*
|
||||
|
||||
%files java
|
||||
%defattr(-,root,root)
|
||||
%doc mapscript/java/README
|
||||
%doc mapscript/java/examples
|
||||
%doc mapscript/java/tests
|
||||
%{_javadir}/*.jar
|
||||
%{_libdir}/libjavamapscript-%{version}.so
|
||||
%{_libdir}/libjavamapscript.so
|
||||
|
||||
%files ruby
|
||||
%doc mapscript/ruby/README
|
||||
%doc mapscript/ruby/examples
|
||||
%{ruby_sitearchdir}/mapscript.so
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Feb 25 2016 Julien Enselme <jujens@jujens.eu> - 7.0.1-1.git6ae2bc6
|
||||
- Update to 7.0.1
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.2-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
@ -446,3 +434,4 @@ chmod 755 %{buildroot}%{perl_vendorarch}/auto/mapscript%{MS_REL}/mapscript%{MS_R
|
||||
http://trac.osgeo.org/mapserver/browser/tags/rel-6-0-1/mapserver/HISTORY.TXT
|
||||
- Fixes bz #722545
|
||||
- Apply changes to spec file for new major version.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user