jengelh/mapserver
SHA256
1
0
Fork 0
forked from pool/mapserver
Code Pull Requests Activity

Accepting request 212676 from home:bruno_friedmann:branches:Application:Geo

Browse Source 
Updated 6.4.1 upstream
Fixed issue with php_mapscript
Cleaning old merge patches
Redone patches for issue 4788 (targeted to 6.4.2)

OBS-URL: https://build.opensuse.org/request/show/212676
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=97
This commit is contained in:
Angelos Tzotsos 2014-01-02 23:11:28 +00:00 committed by Git OBS Bridge
parent ba48059a7c
commit ba1eb1e111
8 changed files with 255 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
4788-php-mapscript.patch Normal file
View File

@ -0,0 +1,18 @@
diff --git a/mapscript/php/CMakeLists.txt b/mapscript/php/CMakeLists.txt
index 89092cc..664b095 100644
--- a/mapscript/php/CMakeLists.txt
+++ b/mapscript/php/CMakeLists.txt
@@ -25,6 +25,13 @@ add_library(php_mapscript MODULE
)
+if(NOT APPLE)
+ set_target_properties( php_mapscript PROPERTIES
+ VERSION ${MapServer_VERSION_STRING}
+ SOVERSION ${MapServer_SOVERSION}
+ )
+endif(NOT APPLE)
+
target_link_libraries(php_mapscript ${MAPSERVER_LIBMAPSERVER})
set_target_properties(php_mapscript PROPERTIES PREFIX "")

20
4788-python-mapscript.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/mapscript/python/CMakeLists.txt b/mapscript/python/CMakeLists.txt
index 33945b2..a14c246 100644
--- a/mapscript/python/CMakeLists.txt
+++ b/mapscript/python/CMakeLists.txt
@@ -34,7 +34,14 @@ SWIG_ADD_MODULE(pythonmapscript python ../mapscript.i pygdioctx/pygdioctx.c)
SWIG_LINK_LIBRARIES(pythonmapscript ${PYTHON_LIBRARIES} ${MAPSERVER_LIBMAPSERVER})
set_target_properties(${SWIG_MODULE_pythonmapscript_REAL_NAME} PROPERTIES PREFIX "")
-set_target_properties(${SWIG_MODULE_pythonmapscript_REAL_NAME} PROPERTIES OUTPUT_NAME _mapscript)
+set_target_properties(${SWIG_MODULE_pythonmapscript_REAL_NAME} PROPERTIES OUTPUT_NAME python_mapscript)
+
+if(NOT APPLE)
+ set_target_properties(${SWIG_MODULE_pythonmapscript_REAL_NAME} PROPERTIES
+ VERSION ${MapServer_VERSION_STRING}
+ SOVERSION ${MapServer_SOVERSION}
+ )
+endif(NOT APPLE)
execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True)" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)

26
4788.patch Normal file
View File

@ -0,0 +1,26 @@
--- a/CMakeLists.txt 2014-01-02 12:17:23.000000000 +0100
+++ b/CMakeLists.txt 2014-01-02 14:57:03.524727998 +0100
@@ -19,6 +19,7 @@
set (MapServer_VERSION_MINOR 4)
set (MapServer_VERSION_REVISION 1)
set (MapServer_VERSION_SUFFIX "")
+set (MapServer_SOVERSION 1)
set(TARGET_VERSION_MAJOR ${MapServer_VERSION_MAJOR})
set(TARGET_VERSION_MINOR ${MapServer_VERSION_MINOR})
@@ -233,13 +234,13 @@
add_library(mapserver SHARED ${mapserver_SOURCES} ${agg_SOURCES})
set_target_properties( mapserver PROPERTIES
VERSION ${MapServer_VERSION_STRING}
- SOVERSION 1
+ SOVERSION ${MapServer_SOVERSION}
)
if(BUILD_STATIC)
add_library(mapserver_static STATIC ${mapserver_SOURCES} ${agg_SOURCES})
set_target_properties( mapserver_static PROPERTIES
VERSION ${MapServer_VERSION_STRING}
- SOVERSION 1
+ SOVERSION ${MapServer_SOVERSION}
)
endif(BUILD_STATIC)

55
4791.patch
View File

@ -1,55 +0,0 @@
From c433652b0b205877e0d8eb921197dd35a46c6050 Mon Sep 17 00:00:00 2001
From: Thomas Bonfort <thomas.bonfort@gmail.com>
Date: Sun, 13 Oct 2013 13:08:48 +0200
Subject: [PATCH] try fixing lib install directory (#4789)
---
CMakeLists.txt | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 268e05d..c094c24 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,8 @@ include(CheckLibraryExists)
include(CheckFunctionExists)
include(CheckIncludeFile)
include(CheckCSourceCompiles)
+include(GNUInstallDirs)
+
@@ -870,23 +872,23 @@ endif(WIN32)
#INSTALL(FILES mapserver-api.h ${PROJECT_BINARY_DIR}/mapserver-version.h DESTINATION include)
if(USE_ORACLE_PLUGIN)
- INSTALL(TARGETS msplugin_oracle DESTINATION lib)
+ INSTALL(TARGETS msplugin_oracle DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif(USE_ORACLE_PLUGIN)
if(USE_MSSQL2008)
- INSTALL(TARGETS msplugin_mssql2008 DESTINATION lib)
+ INSTALL(TARGETS msplugin_mssql2008 DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif(USE_MSSQL2008)
if(USE_SDE91)
- INSTALL(TARGETS msplugin_sde91 DESTINATION lib)
+ INSTALL(TARGETS msplugin_sde91 DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif(USE_SDE91)
if(USE_SDE92)
- INSTALL(TARGETS msplugin_sde92 DESTINATION lib)
+ INSTALL(TARGETS msplugin_sde92 DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif(USE_SDE92)
-INSTALL(TARGETS sortshp shptree shptreevis msencrypt legend scalebar tile4ms shptreetst shp2img mapserv mapserver RUNTIME DESTINATION bin LIBRARY DESTINATION lib)
+INSTALL(TARGETS sortshp shptree shptreevis msencrypt legend scalebar tile4ms shptreetst shp2img mapserv mapserver RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
if(BUILD_STATIC)
- INSTALL(TARGETS mapserver_static DESTINATION lib)
+ INSTALL(TARGETS mapserver_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif(BUILD_STATIC)
--
1.8.4

3
mapserver-6.4.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f25553798fbd4eaf227bda66ebe44f40292ad7ec65f8bb1b3698580a518ca386
size 2097411

3
mapserver-6.4.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:445915fd6e31ed199ce477edd1d9f32d609d3001cd52d3e458ff159543403d64
size 2098792

39
mapserver.changes
View File

@ -1,8 +1,47 @@
-------------------------------------------------------------------
Thu Jan 2 20:30:07 UTC 2014 - bruno@ioda-net.ch
- updated to upstream 6.4.1
http://mapserver.org/development/changelog/changelog-6-4.html#changelog-6-4-1
full list of changes in 6.4.1
- spec cleaning
- modified patches:
* 4788.patch (upstream issue 4788) SOVERSION in CMakefile
* 4788-php-mapscript patch for php versionning
* 4788-python-mapscript patch for python versionning
- deleted patches: (merged upstream)
* 4791.patch fix lib path install
* 4803.patch fix for force_st2d
-------------------------------------------------------------------
Mon Nov 18 14:05:34 UTC 2013 - bruno@ioda-net.ch
- Added Requires proj (missing espg for tools otherwise)
- Added upstream #4803 patch forcest2d
-------------------------------------------------------------------
Thu Nov 14 15:27:13 UTC 2013 - bruno@ioda-net.ch
- packaging : fix php mapscript name in mapscript.ini (symlink)
- Added upstream #4788 patch versionning php-mapscript
Fix by removing buggy pre-post script
- /srv/www/cgi-bin/ binaries as symlink to /usr/bin
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Nov 3 15:28:44 UTC 2013 - tzotsos@opensuse.org Sun Nov 3 15:28:44 UTC 2013 - tzotsos@opensuse.org
- Some minor spec cleanup - Some minor spec cleanup
-------------------------------------------------------------------
Sat Oct 26 16:28:36 UTC 2013 - bruno@ioda-net.ch
- packaging fix tab
- packaging fix php-mapscript
rename php_mapscript.so to php_mapscript-%{version}.so
(upstream bug in 6.4.0)
remove post check which remove php_mapscript.so
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Oct 13 14:33:33 UTC 2013 - bruno@ioda-net.ch Sun Oct 13 14:33:33 UTC 2013 - bruno@ioda-net.ch

310
mapserver.spec
View File

@ -10,7 +10,7 @@
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the # upon. The license for this file, and modifications and additions to the
# file, is the same license as for the mapserver package itself (unless the # file, is the same license as for the mapserve package itself (unless the
# license for the mapserver package is not an Open Source License, in which # license for the mapserver package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a # case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
@ -18,70 +18,75 @@
# #
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# We only build for 12.3 and up
# #
Name: mapserver
Name: mapserver %define fileversion 6.4.1
%define fileversion 6.4.0
%define libname libmapserver1 %define libname libmapserver1
Version: 6.4.0 Version: 6.4.1
Release: 1 Release: 1
License: MIT License: MIT
#see http://www.mapserver.org/copyright.html#license #see http://www.mapserver.org/copyright.html#license
Group: Productivity/Networking/Web/Servers Group: Productivity/Networking/Web/Servers
Source: %{name}-%{fileversion}.tar.gz Source: %{name}-%{fileversion}.tar.gz
Url: http://www.mapserver.org Url: http://www.mapserver.org
#wget https://github.com/mapserver/mapserver/pull/#PATCH.patch #wget https://github.com/mapserver/mapserver/pull/#PATCH.patch
# tbonfort fix lib in cmake_install Patch1: 4788.patch
Patch0: 4791.patch Patch2: 4788-php-mapscript.patch
Summary: Environment for building spatially-enabled internet applications Patch3: 4788-python-mapscript.patch
Summary: Environment for building spatially-enabled internet applications
#@TODO : we should normally only require client & libs for database #@TODO : we should normally only require client & libs for database
Requires: postgresql >= 9.1 Requires: postgresql >= 9.1
Requires: mysql Requires: mysql
Requires: FastCGI Requires: FastCGI
Requires: apache2 Requires: apache2
Requires: librsvg Requires: librsvg
Requires: fribidi Requires: fribidi
Requires: %{libname} = %{version}-%{release} #Added proj due to missing espg tools for shp2img for example
Requires: proj
Requires: %{libname} = %{version}-%{release}
%if 0%{?suse_version} != 1010 %if 0%{?suse_version} != 1010
BuildRequires: xorg-x11-libXpm-devel BuildRequires: xorg-x11-libXpm-devel
%endif %endif
BuildRequires: rpm BuildRequires: rpm
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: cmake >= 2.4 BuildRequires: cmake >= 2.4
BuildRequires: pam BuildRequires: pam
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: postgresql-devel >= 9.1 BuildRequires: postgresql-devel >= 9.1
BuildRequires: libexpat-devel BuildRequires: libexpat-devel
BuildRequires: mysql-devel BuildRequires: mysql-devel
BuildRequires: giflib-devel BuildRequires: giflib-devel
BuildRequires: libgeos-devel BuildRequires: libgeos-devel
BuildRequires: libproj-devel BuildRequires: libproj-devel
BuildRequires: libgdal-devel >= 1.10 BuildRequires: libgdal-devel >= 1.10
#BuildRequires: libjpeg8-devel I've normally use that one ? #BuildRequires: libjpeg8-devel I've normally use that one ?
BuildRequires: openjpeg2-devel BuildRequires: openjpeg2-devel
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: freetype2-devel BuildRequires: freetype2-devel
BuildRequires: FastCGI-devel BuildRequires: freetype2
BuildRequires: fribidi-devel BuildRequires: FastCGI-devel
BuildRequires: cairo-devel BuildRequires: fribidi-devel
BuildRequires: gd-devel >= 2.0.16 BuildRequires: cairo-devel
BuildRequires: krb5-devel BuildRequires: gd-devel >= 2.0.16
BuildRequires: zlib-devel BuildRequires: krb5-devel
BuildRequires: libxml2-devel BuildRequires: zlib-devel
BuildRequires: libxslt-devel BuildRequires: libxml2-devel
BuildRequires: libjpeg-devel BuildRequires: libxslt-devel
BuildRequires: libpng-devel BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel BuildRequires: libpng-devel
BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: libtiff-devel
BuildRequires: swig BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: update-alternatives BuildRequires: proj
BuildRequires: apache2-devel BuildRequires: swig
BuildRequires: krb5-devel BuildRequires: update-alternatives
BuildRequires: libgcj-devel BuildRequires: apache2-devel
BuildRequires: krb5-devel
BuildRequires: libgcj-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@ -119,8 +124,8 @@ BuildRequires: php-devel
Requires: php Requires: php
Requires: php-gd Requires: php-gd
%endif %endif
Provides: php-mapserver = %{version}-%{release} Provides: php-mapserver = %{version}-%{release}
Obsoletes: php-mapserver < %{version}-%{release} Obsoletes: php-mapserver < %{version}-%{release}
%description -n php-mapscript %description -n php-mapscript
The PHP/Mapscript extension provides full map customization capabilities within the PHP scripting language. The PHP/Mapscript extension provides full map customization capabilities within the PHP scripting language.
@ -132,8 +137,8 @@ BuildRequires: perl-base
BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(ExtUtils::MakeMaker)
Requires: %{libname} = %{version}-%{release} Requires: %{libname} = %{version}-%{release}
Requires: perl-base Requires: perl-base
Provides: mapserver-perl = %{version}-%{release} Provides: mapserver-perl = %{version}-%{release}
Obsoletes: mapserver-perl < %{version}-%{release} Obsoletes: mapserver-perl < %{version}-%{release}
%description -n perl-mapscript %description -n perl-mapscript
The Perl/Mapscript extension provides full map customization capabilities The Perl/Mapscript extension provides full map customization capabilities
@ -142,11 +147,11 @@ within the Perl programming language.
%package -n python-mapscript %package -n python-mapscript
Summary: Python/Mapscript map making extensions to Python Summary: Python/Mapscript map making extensions to Python
Group: Development/Languages/Python Group: Development/Languages/Python
BuildRequires: python-devel BuildRequires: python-devel
Requires: %{libname} = %{version}-%{release} Requires: %{libname} = %{version}-%{release}
Requires: python-base Requires: python-base
Provides: mapserver-python = %{version}-%{release} Provides: mapserver-python = %{version}-%{release}
Obsoletes: mapserver-python < %{version}-%{release} Obsoletes: mapserver-python < %{version}-%{release}
%description -n python-mapscript %description -n python-mapscript
The Python/Mapscript extension provides full map customization capabilities The Python/Mapscript extension provides full map customization capabilities
@ -165,11 +170,11 @@ BuildRequires: java-1_5_0-ibm-alsa
%endif %endif
Requires: %{libname} = %{version}-%{release} Requires: %{libname} = %{version}-%{release}
Requires: java >= 1.6 Requires: java >= 1.6
Requires: swig Requires: swig
Provides: java-mapscript = %{version}-%{release} Provides: java-mapscript = %{version}-%{release}
Provides: mapserver-java = %{version}-%{release} Provides: mapserver-java = %{version}-%{release}
Obsoletes: mapserver-java < %{version}-%{release} Obsoletes: mapserver-java < %{version}-%{release}
Obsoletes: java-mapscript < %{version}-%{release} Obsoletes: java-mapscript < %{version}-%{release}
%description -n libjavamapscript %description -n libjavamapscript
The Java/Mapscript extension provides full map customization capabilities The Java/Mapscript extension provides full map customization capabilities
@ -178,12 +183,12 @@ within the Java programming language.
%package -n ruby-mapscript %package -n ruby-mapscript
Summary: Ruby/Mapscript map making extensions to Ruby Summary: Ruby/Mapscript map making extensions to Ruby
Group: Development/Languages/Ruby Group: Development/Languages/Ruby
Requires: ruby Requires: ruby
BuildRequires: ruby-devel BuildRequires: ruby-devel
BuildRequires: ruby-macros BuildRequires: ruby-macros
Requires: %{libname} = %{version}-%{release} Requires: %{libname} = %{version}-%{release}
Provides: mapserver-ruby = %{version}-%{release} Provides: mapserver-ruby = %{version}-%{release}
Obsoletes: mapserver-ruby < %{version}-%{release} Obsoletes: mapserver-ruby < %{version}-%{release}
%description -n ruby-mapscript %description -n ruby-mapscript
The Ruby/Mapscript extension provides full map customization capabilities The Ruby/Mapscript extension provides full map customization capabilities
@ -200,7 +205,9 @@ against the C Mapserver library.
%prep %prep
%setup -q -n %{name}-%{fileversion} %setup -q -n %{name}-%{fileversion}
%patch0 -p1 %patch1 -p1
%patch2 -p1
%patch3 -p1
%build -n %{name}-%{fileversion} %build -n %{name}-%{fileversion}
@ -210,70 +217,69 @@ cd build
#Pre export the PREFIX ( having it on the command line doesn't expand correctly for #Pre export the PREFIX ( having it on the command line doesn't expand correctly for
#dynamic postgresql location #dynamic postgresql location
export CMAKE_PREFIX_PATH="%{_includedir}:%{_includedir}/fastcgi:%(pg_config --includedir):%(pg_config --includedir-server):%(pg_config --libdir)" export CMAKE_PREFIX_PATH="%{_includedir}:%{_includedir}/fastcgi:%(pg_config --includedir):%(pg_config --includedir-server):%(pg_config --libdir)"
export CFLAGS=$RPM_OPT_FLAGS export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
export CXXFLAGS=$RPM_OPT_FLAGS export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
#export LDFLAGS="-Wl,-Bsymbolic-functions $LDFLAGS" \
# -D CMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-Bsymbolic-functions" \
# -D CMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-Bsymbolic-functions" \
# -D CMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-Bsymbolic-functions" \
#specify all options and play with true/false #specify all options and play with true/false
#so we always know which option are included in our build. #so we always know which option are included in our build.
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_INSTALL_LIBDIR=%{_libdir} \ -DCMAKE_SKIP_RPATH=ON \
-DCMAKE_SKIP_RPATH=ON \ -DCMAKE_C_FLAGS_RELEASE="%{optflags} -fno-strict-aliasing" \
-DCMAKE_C_FLAGS="%{optflags}" \ -DCMAKE_CXX_FLAGS_RELEASE="%{optflags} -fno-strict-aliasing" \
-DCMAKE_CXX_FLAGS="%{optflags}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_BUILD_TYPE="Release" \
-DLIB_SUFFIX=%{_libdir} \ -DCMAKE_SKIP_INSTALL_RPATH=ON \
-DCMAKE_BUILD_TYPE="Release" \ -DCMAKE_SKIP_RPATH=ON \
-DWITH_CAIRO=TRUE \ -DWITH_CAIRO=TRUE \
-DWITH_CLIENT_WFS=TRUE \ -DWITH_CLIENT_WFS=TRUE \
-DWITH_CLIENT_WMS=TRUE \ -DWITH_CLIENT_WMS=TRUE \
-DWITH_CURL=TRUE \ -DWITH_CURL=TRUE \
-DWITH_FCGI=TRUE \ -DWITH_FCGI=TRUE \
-DWITH_FRIBIDI=TRUE \ -DWITH_FRIBIDI=TRUE \
-DWITH_GD=TRUE \ -DWITH_GD=TRUE \
-DWITH_GDAL=TRUE \ -DWITH_GDAL=TRUE \
-DWITH_GEOS=TRUE \ -DWITH_GEOS=TRUE \
-DWITH_GIF=TRUE \ -DWITH_GIF=TRUE \
-DWITH_ICONV=TRUE \ -DWITH_ICONV=TRUE \
-DWITH_JAVA=TRUE \ -DWITH_JAVA=TRUE \
-DWITH_KML=TRUE \ -DWITH_KML=TRUE \
-DWITH_LIBXML2=TRUE \ -DWITH_LIBXML2=TRUE \
-DWITH_OGR=TRUE \ -DWITH_OGR=TRUE \
-DWITH_MYSQL=TRUE \ -DWITH_MYSQL=TRUE \
-DWITH_PERL=TRUE \ -DWITH_PERL=TRUE \
-DCUSTOM_PERL_SITE_ARCH_DIR="%{perl_vendorarch}" \ -DCUSTOM_PERL_SITE_ARCH_DIR="%{perl_vendorarch}" \
-DWITH_PHP=TRUE \ -DWITH_PHP=TRUE \
-DWITH_POSTGIS=TRUE \ -DWITH_POSTGIS=TRUE \
-DWITH_PROJ=TRUE \ -DWITH_PROJ=TRUE \
-DWITH_PYTHON=TRUE \ -DWITH_PYTHON=TRUE \
-DWITH_RUBY=TRUE \ -DWITH_RUBY=TRUE \
-DWITH_SOS=TRUE \ -DWITH_SOS=TRUE \
-DWITH_THREAD_SAFETY=TRUE \ -DWITH_THREAD_SAFETY=TRUE \
-DWITH_WCS=TRUE \ -DWITH_WCS=TRUE \
-DWITH_WMS=TRUE \ -DWITH_WMS=TRUE \
-DWITH_WFS=TRUE \ -DWITH_WFS=TRUE \
-DWITH_XMLMAPFILE=TRUE \ -DWITH_XMLMAPFILE=TRUE \
-DWITH_POINT_Z_M=TRUE \ -DWITH_POINT_Z_M=TRUE \
-DWITH_APACHE_MODULE=FALSE \ -DWITH_APACHE_MODULE=FALSE \
-DWITH_SVGCAIRO=FALSE \ -DWITH_SVGCAIRO=FALSE \
-DWITH_MYSQL=FALSE \ -DWITH_MYSQL=FALSE \
-DWITH_CSHARP=FALSE \ -DWITH_CSHARP=FALSE \
-DWITH_ORACLESPATIAL=FALSE \ -DWITH_ORACLESPATIAL=FALSE \
-DWITH_ORACLE_PLUGIN=FALSE \ -DWITH_ORACLE_PLUGIN=FALSE \
-DWITH_MSSQL2008=FALSE \ -DWITH_MSSQL2008=FALSE \
-DWITH_SDE=FALSE \ -DWITH_SDE=FALSE \
-DWITH_SDE_PLUGIN=FALSE \ -DWITH_SDE_PLUGIN=FALSE \
-DWITH_EXEMPI=FALSE \ -DWITH_EXEMPI=FALSE \
../%{name}-%{fileversion}/ ../%{name}-%{fileversion}/
## WARNING !!! using %%{?_smp_mflags} will break build ## WARNING !!! using %%{?_smp_mflags} will break build
## This is not anymore true for 6x versions, if it happen then it's a bug :-) ## This is not anymore true for 6x versions, if it happen then it's a bug :-)
make %{?jobs:-j%{jobs}} make %{?jobs:-j%{jobs}}
%check
# make test
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
@ -297,40 +303,31 @@ cd ../build
%makeinstall DESTDIR="%{buildroot}" %makeinstall DESTDIR="%{buildroot}"
cd ../%{name}-%{fileversion} cd ../%{name}-%{fileversion}
#@TODO FIX upstream this ugly hack work in progress
%ifarch x86_64
mv -v %{buildroot}/usr/lib/*.so* %{buildroot}%{_libdir}/
%endif
#@TODO shouldn't we use ln in post ?
cp -a %{buildroot}%{_bindir}/mapserv %{buildroot}%{_cgibindir}/mapserv
cp -a %{buildroot}%{_bindir}/legend %{buildroot}%{_cgibindir}/legend
cp -a %{buildroot}%{_bindir}/scalebar %{buildroot}%{_cgibindir}/scalebar
# install php config file
mkdir -p %{buildroot}%{_sysconfdir}/php5/conf.d/ mkdir -p %{buildroot}%{_sysconfdir}/php5/conf.d/
cat > %{buildroot}%{_sysconfdir}/php5/conf.d/mapscript.ini <<EOF cat > %{buildroot}%{_sysconfdir}/php5/conf.d/mapscript.ini <<EOF
; Enable %{name} extension module ; Enable %{name} extension module
#For 6.4 this is still an upstream bug ; For 6.4 we name the symlink here
#extension=php_mapscript-%%{version}.so
extension=php_mapscript.so extension=php_mapscript.so
EOF EOF
# Important remove any RPATH in .so # Install our links
#find %%{buildroot}/ -iname "*.so*" -type f -exec chrpath --delete {} \; #@ todo : check
# Having them as link is good for bytes, but httpd_daemon should allow
# reading those symlinks which is not the default
cd %{buildroot}%{_cgibindir}
ln -s ../../../usr/bin/mapserv mapserv
ln -s ../../../usr/bin/legend legend
ln -s ../../../usr/bin//scalebar scalebar
# remove vera fonts, these are provided system wide # remove vera fonts, these are provided system wide
#@todo then we should patch the fonts file example #@todo then we should patch the fonts file example
rm -rf %{buildroot}%{_docdir}/%{name}/tests/vera rm -rf %{buildroot}%{_docdir}/%{name}/tests/vera
rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/tests/vera rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/tests/vera
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
%check
# make test
%post -n %{libname} -p /sbin/ldconfig %post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig
@ -359,23 +356,14 @@ rm -rf %{buildroot}
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libmapserver.so.* %{_libdir}/libmapserver.so.*
%files -n php-mapscript %files -n php-mapscript
%defattr(-,root,root) %defattr(-,root,root)
%doc mapscript/php/README %doc mapscript/php/README
%doc mapscript/php/examples %doc mapscript/php/examples
%config(noreplace) %{_sysconfdir}/php5/conf.d/mapscript.ini %config(noreplace) %{_sysconfdir}/php5/conf.d/mapscript.ini
%{_libdir}/php5/extensions/php_mapscript.so %{_libdir}/php5/extensions/php_mapscript.so
%{_libdir}/php5/extensions/php_mapscript.so.1
%post -n php-mapscript %{_libdir}/php5/extensions/php_mapscript.so.%{version}
# Clean up any previous wrong version
if [ -e %{_libdir}/php5/extensions/php_mapscript.so ]; then
rm -f %{_libdir}/php5/extensions/php_mapscript.so
fi
if [ -e %{_sysconfdir}/php5/conf.d/%{name}.ini ]; then
rm -f %{_sysconfdir}/php5/conf.d/%{name}.ini
fi
%files -n perl-mapscript %files -n perl-mapscript
%defattr(-,root,root) %defattr(-,root,root)
@ -404,9 +392,9 @@ fi
%doc mapscript/ruby/examples %doc mapscript/ruby/examples
#@todo fix that by using a proper way ? #@todo fix that by using a proper way ?
%ifarch x86_64 %ifarch x86_64
%{_libdir}/ruby/%{rb_ver}/x86_64-linux/mapscript.so %{_libdir}/ruby/site_ruby/%{rb_ver}/x86_64-linux/mapscript.so
%else %else
%{_libdir}/ruby/%{rb_ver}/i586-linux/mapscript.so %{_libdir}/ruby/site_ruby/%{rb_ver}/i586-linux/mapscript.so
%endif %endif
%files devel %files devel