From 6ba7106a6b977c911ed5947f2a6f214204c272fb142295ebf80d3b497fbe33e1 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 5 Apr 2017 17:23:30 +0000 Subject: [PATCH] update mapserver to recent version 7.0.4 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=102 --- 4788-php-mapscript.patch | 18 --- 4788-python-mapscript.patch | 20 --- 4788.patch | 26 ---- 4875-incorrect-blending-tif.patch | 67 ---------- 4912-php56-php-input.patch | 114 ------------------ giflib_5.1.0.patch | 14 --- mapserver-6.4.1.tar.gz | 3 - mapserver-7.0.4.tar.gz | 3 + mapserver.changes | 5 + mapserver.spec | 114 +++++------------- swig_3.patch | 17 --- ...on-mapscript-soversion-install-issue.patch | 23 ---- 12 files changed, 39 insertions(+), 385 deletions(-) delete mode 100644 4788-php-mapscript.patch delete mode 100644 4788-python-mapscript.patch delete mode 100644 4788.patch delete mode 100644 4875-incorrect-blending-tif.patch delete mode 100644 4912-php56-php-input.patch delete mode 100644 giflib_5.1.0.patch delete mode 100644 mapserver-6.4.1.tar.gz create mode 100644 mapserver-7.0.4.tar.gz delete mode 100644 swig_3.patch delete mode 100644 xxxx-fix-python-mapscript-soversion-install-issue.patch diff --git a/4788-php-mapscript.patch b/4788-php-mapscript.patch deleted file mode 100644 index 76bce2d..0000000 --- a/4788-php-mapscript.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 "") diff --git a/4788-python-mapscript.patch b/4788-python-mapscript.patch deleted file mode 100644 index f867e7c..0000000 --- a/4788-python-mapscript.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 _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) diff --git a/4788.patch b/4788.patch deleted file mode 100644 index 1a09f4c..0000000 --- a/4788.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- 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) - diff --git a/4875-incorrect-blending-tif.patch b/4875-incorrect-blending-tif.patch deleted file mode 100644 index 7863dd8..0000000 --- a/4875-incorrect-blending-tif.patch +++ /dev/null @@ -1,67 +0,0 @@ -From bc5c58296f29f0fabb117c9111ca73b723a642d0 Mon Sep 17 00:00:00 2001 -From: Thomas Bonfort -Date: Tue, 25 Feb 2014 15:14:23 +0100 -Subject: [PATCH 1/2] Fix blending of semi-opaque pixels in average and - bilinear resamplers (#4875) - ---- - mapresample.c | 2 +- - maputil.c | 18 +++++++++--------- - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/mapresample.c b/mapresample.c -index 419d07b..7980355 100644 ---- a/mapresample.c -+++ b/mapresample.c -@@ -671,7 +671,7 @@ msAverageRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb, - alpha = (unsigned char) - MAX(0,MIN(255,255*dfAlpha01+0.5)); - -- RB_SET_PIXEL(dst_rb,nDstX,nDstY, -+ RB_MIX_PIXEL(dst_rb,nDstX,nDstY, - red, green, blue, alpha ); - } - #ifdef USE_GD -diff --git a/maputil.c b/maputil.c -index ef0d309..34ead4d 100644 ---- a/maputil.c -+++ b/maputil.c -@@ -2096,19 +2096,19 @@ void msAlphaBlendPM( unsigned char red_src, unsigned char green_src, - /* Cases with actual blending. */ - /* -------------------------------------------------------------------- */ - if(!alpha_dst || *alpha_dst == 255) { -- int weight_dst = 256 - alpha_src; -+ int weight_dst = 255 - alpha_src; - -- *red_dst = (256 * red_src + *red_dst * weight_dst) >> 8; -- *green_dst = (256 * green_src + *green_dst * weight_dst) >> 8; -- *blue_dst = (256 * blue_src + *blue_dst * weight_dst) >> 8; -+ *red_dst = (alpha_src * red_src + *red_dst * weight_dst) >> 8; -+ *green_dst = (alpha_src * green_src + *green_dst * weight_dst) >> 8; -+ *blue_dst = (alpha_src * blue_src + *blue_dst * weight_dst) >> 8; - } else { -- int weight_dst = (256 - alpha_src); -+ int weight_dst = (255 - alpha_src); - -- *red_dst = (256 * red_src + *red_dst * weight_dst) >> 8; -- *green_dst = (256 * green_src + *green_dst * weight_dst) >> 8; -- *blue_dst = (256 * blue_src + *blue_dst * weight_dst) >> 8; -+ *red_dst = (alpha_src * red_src + *red_dst * weight_dst) >> 8; -+ *green_dst = (alpha_src * green_src + *green_dst * weight_dst) >> 8; -+ *blue_dst = (alpha_src * blue_src + *blue_dst * weight_dst) >> 8; - -- *alpha_dst = (256 * alpha_src + *alpha_dst * weight_dst) >> 8; -+ *alpha_dst = (255 * alpha_src + *alpha_dst * weight_dst) >> 8; - } - } - - -From 9aacff0d49f9dd4ea300e9e2dc68792f21159d88 Mon Sep 17 00:00:00 2001 -From: Thomas Bonfort -Date: Tue, 25 Feb 2014 16:05:20 +0100 -Subject: [PATCH 2/2] update submodule - ---- - msautotest | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/4912-php56-php-input.patch b/4912-php56-php-input.patch deleted file mode 100644 index 0a95b9d..0000000 --- a/4912-php56-php-input.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 1a0a11f2690b079eb53db982f1d7cdf9e3ecf80f Mon Sep 17 00:00:00 2001 -From: Bas Couwenberg -Date: Sat, 26 Apr 2014 13:46:41 +0200 -Subject: [PATCH 1/2] 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 . -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 ---- - mapscript/php/owsrequest.c | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/mapscript/php/owsrequest.c b/mapscript/php/owsrequest.c -index 428c8dd..8fa48c7 100644 ---- a/mapscript/php/owsrequest.c -+++ b/mapscript/php/owsrequest.c -@@ -32,6 +32,7 @@ - #include "php_mapscript.h" - #include "SAPI.h" - #include "php_variables.h" -+#include "php_streams.h" - - char *owsrequest_getenv(const char *name, void *thread_context); - -@@ -193,9 +194,29 @@ PHP_METHOD(OWSRequestObj, loadParams) - cgirequestObj_loadParams(php_owsrequest->cgirequest, owsrequest_getenv, NULL, 0, thread_context); - } - } else { -+ php_stream *s = php_stream_temp_new(); -+#if PHP_VERSION_ID >= 50600 -+ 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 - } - } - - -From 0ed9072658a0262f1273ba8ee74dad30229597ec Mon Sep 17 00:00:00 2001 -From: Bas Couwenberg -Date: Sat, 26 Apr 2014 16:26:34 +0200 -Subject: [PATCH 2/2] Minor fixes incorporating Thomas' feedback. - ---- - mapscript/php/owsrequest.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/mapscript/php/owsrequest.c b/mapscript/php/owsrequest.c -index 8fa48c7..f01d361 100644 ---- a/mapscript/php/owsrequest.c -+++ b/mapscript/php/owsrequest.c -@@ -32,7 +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); - -@@ -194,8 +196,8 @@ PHP_METHOD(OWSRequestObj, loadParams) - cgirequestObj_loadParams(php_owsrequest->cgirequest, owsrequest_getenv, NULL, 0, thread_context); - } - } else { -- php_stream *s = php_stream_temp_new(); - #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 */ diff --git a/giflib_5.1.0.patch b/giflib_5.1.0.patch deleted file mode 100644 index 547f089..0000000 --- a/giflib_5.1.0.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- mapimageio.c.orig 2016-02-05 15:03:30.375271083 +0100 -+++ mapimageio.c 2016-02-05 15:15:29.994938301 +0100 -@@ -1303,7 +1303,11 @@ int readGIF(char *path, rasterBufferObj - - } while (recordType != TERMINATE_RECORD_TYPE); - -+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5 && defined GIFLIB_MINOR && GIFLIB_MINOR >= 1 -+ if (DGifCloseFile(image, &errcode) == GIF_ERROR) { -+#else - if (DGifCloseFile(image) == GIF_ERROR) { -+#endif - #if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5 - msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg(image->Error)); - #else diff --git a/mapserver-6.4.1.tar.gz b/mapserver-6.4.1.tar.gz deleted file mode 100644 index e3ee8c5..0000000 --- a/mapserver-6.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:445915fd6e31ed199ce477edd1d9f32d609d3001cd52d3e458ff159543403d64 -size 2098792 diff --git a/mapserver-7.0.4.tar.gz b/mapserver-7.0.4.tar.gz new file mode 100644 index 0000000..3127cac --- /dev/null +++ b/mapserver-7.0.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c91d40da5cc242b20ca7e29c41bd9eb23097b98a77908b1d708e9708f6f6cf69 +size 2624614 diff --git a/mapserver.changes b/mapserver.changes index 87e8cda..ab690ef 100644 --- a/mapserver.changes +++ b/mapserver.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 5 15:59:16 UTC 2017 - opensuse@dstoecker.de + +- udate to Mapserver 7.0.4, drop all patches + ------------------------------------------------------------------- Tue Mar 8 07:02:53 UTC 2016 - ralf.habacker@freenet.de diff --git a/mapserver.spec b/mapserver.spec index 3a48190..6f2ba11 100644 --- a/mapserver.spec +++ b/mapserver.spec @@ -1,53 +1,36 @@ # -# spec file for package mapserver 6.4 series -# this build respect python,java,perl,php package naming convention under -# openSUSE. +# spec file for package mapserver # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2014 Ioda-Net Sàrl, Charmoille, Switzerland. Bruno Friedmann (tigerfoot) # Copyright (c) 2015 Angelos Tzotsos (kalxas) # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to 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 +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%if 0%{?sles_version} != 11 -%define _with_ruby 1 -%endif -%bcond_with ruby -%define fileversion 6.4.1 -%define libname libmapserver1 + +# +%define libname libmapserver2 %define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") %define _cgibindir /srv/www/cgi-bin Name: mapserver -Version: 6.4.1 +Version: 7.0.4 Release: 0 Summary: Environment for building spatially-enabled internet applications License: MIT -#see http://www.mapserver.org/copyright.html#license Group: Productivity/Networking/Web/Servers Url: http://www.mapserver.org -Source: %{name}-%{fileversion}.tar.gz -#wget https://github.com/mapserver/mapserver/pull/#PATCH.patch -Patch1: 4788.patch -Patch2: 4788-php-mapscript.patch -Patch3: 4788-python-mapscript.patch -Patch4: 4875-incorrect-blending-tif.patch -Patch5: 4912-php56-php-input.patch -# Fix Build with GIFLIB >= 5.1.0 -Patch6: giflib_5.1.0.patch -Patch7: swig_3.patch -Patch8: xxxx-fix-python-mapscript-soversion-install-issue.patch +Source: http://download.osgeo.org/mapserver/%{name}-%{version}.tar.gz BuildRequires: FastCGI-devel BuildRequires: apache2-devel BuildRequires: autoconf @@ -62,10 +45,12 @@ BuildRequires: gcc-c++ BuildRequires: gd-devel >= 2.0.16 BuildRequires: giflib-devel BuildRequires: krb5-devel +BuildRequires: libcurl-devel BuildRequires: libexpat-devel BuildRequires: libgcj-devel BuildRequires: libgdal-devel >= 1.10 BuildRequires: libgeos-devel +BuildRequires: libhdf4 BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libproj-devel @@ -76,32 +61,25 @@ BuildRequires: mysql-devel BuildRequires: openjpeg2-devel BuildRequires: pam BuildRequires: pam-devel -BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: postgresql-devel >= 9.1 BuildRequires: proj BuildRequires: readline-devel BuildRequires: rpm BuildRequires: swig BuildRequires: update-alternatives -BuildRequires: zlib-devel -BuildRequires: libcurl-devel -%if 0%{?suse_version} != 1010 BuildRequires: xorg-x11-libXpm-devel -%endif -%if 0%{?sles_version} == 11 || %{?suse_version} == 1310 -BuildRequires: libhdf4 -%endif +BuildRequires: zlib-devel +BuildRequires: perl(ExtUtils::MakeMaker) Requires: %{libname} = %{version}-%{release} Requires: FastCGI Requires: apache2 Requires: fribidi Requires: librsvg -Requires: proj Requires: mysql Requires: postgresql >= 9.1 +Requires: proj BuildRoot: %{_tmppath}/%{name}-%{version}-build - %description Mapserver is an internet mapping program that converts GIS data to map images in real time. With appropriate interface pages, @@ -126,15 +104,9 @@ Requires: %{libname} = %{version}-%{release} Requires: apache2 Provides: php-mapserver = %{version}-%{release} Obsoletes: php-mapserver < %{version}-%{release} -%if 0%{?sles_version} >= 11 -BuildRequires: php53-devel -Requires: php53 -Requires: php53-gd -%else BuildRequires: php-devel Requires: php Requires: php-gd -%endif %description -n php-mapscript The PHP/Mapscript extension provides full map customization capabilities within the PHP scripting language. @@ -142,8 +114,8 @@ The PHP/Mapscript extension provides full map customization capabilities within %package -n perl-mapscript Summary: Perl/Mapscript map making extensions to Perl Group: Development/Languages/Perl -BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl-base +BuildRequires: perl(ExtUtils::MakeMaker) Requires: %{libname} = %{version}-%{release} Requires: perl-base Provides: mapserver-perl = %{version}-%{release} @@ -158,10 +130,8 @@ Summary: Python/Mapscript map making extensions to Python Group: Development/Languages/Python BuildRequires: python-devel Requires: python-base -%if 0%{?sles_version} != 11 BuildRequires: python3-devel Requires: python3-base -%endif Requires: %{libname} = %{version}-%{release} Provides: mapserver-python = %{version}-%{release} Obsoletes: mapserver-python < %{version}-%{release} @@ -181,24 +151,18 @@ Requires: java >= 1.6 Requires: swig Provides: java-mapscript = %{version}-%{release} Provides: mapserver-java = %{version}-%{release} -Obsoletes: mapserver-java < %{version}-%{release} Obsoletes: java-mapscript < %{version}-%{release} -%if 0%{?sles_version} == 10 -%ifarch i586 -BuildRequires: java-1_5_0-ibm-alsa -%endif -%endif +Obsoletes: mapserver-java < %{version}-%{release} %description -n libjavamapscript The Java/Mapscript extension provides full map customization capabilities within the Java programming language. -%if %{with ruby} %package -n ruby-mapscript Summary: Ruby/Mapscript map making extensions to Ruby Group: Development/Languages/Ruby -BuildRequires: ruby-devel BuildRequires: ruby-common +BuildRequires: ruby-devel Requires: %{libname} = %{version}-%{release} Requires: ruby Provides: mapserver-ruby = %{version}-%{release} @@ -207,7 +171,6 @@ Obsoletes: mapserver-ruby < %{version}-%{release} %description -n ruby-mapscript The Ruby/Mapscript extension provides full map customization capabilities within the Ruby programming language. -%endif %package devel Summary: Mapserver development files @@ -219,24 +182,15 @@ The Mapserver development package provides necessary files to build against the C Mapserver library. %prep -%setup -q -n %{name}-%{fileversion} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p0 -%patch7 -p0 -%patch8 -p1 +%setup -q -%build -n %{name}-%{fileversion} +%build -cd .. mkdir build cd build #Pre export the PREFIX ( having it on the command line doesn't expand correctly for #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="%{optflags} -fno-strict-aliasing" export CXXFLAGS="%{optflags} -fno-strict-aliasing" @@ -244,6 +198,8 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing" #so we always know which option are included in our build. cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ + -DINSTALL_LIB_DIR=%{_libdir} \ -DCMAKE_C_FLAGS_RELEASE="%{optflags} -fno-strict-aliasing" \ -DCMAKE_CXX_FLAGS_RELEASE="%{optflags} -fno-strict-aliasing" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -272,9 +228,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DWITH_POSTGIS=TRUE \ -DWITH_PROJ=TRUE \ -DWITH_PYTHON=TRUE \ -%if %{with ruby} -DWITH_RUBY=TRUE \ -%endif -DWITH_SOS=TRUE \ -DWITH_THREAD_SAFETY=TRUE \ -DWITH_WCS=TRUE \ @@ -292,13 +246,10 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DWITH_SDE=FALSE \ -DWITH_SDE_PLUGIN=FALSE \ -DWITH_EXEMPI=FALSE \ - ../%{name}-%{fileversion}/ + .. -## WARNING !!! using %%{?_smp_mflags} will break build -## This is not anymore true for 6x versions, if it happen then it's a bug :-) make %{?jobs:-j%{jobs}} - %check # make test @@ -311,7 +262,7 @@ mkdir -p %{buildroot}%{_libdir}/php5/extensions mkdir -p %{buildroot}/%{_bindir} mkdir -p %{buildroot}%{python_sitearch}/ mkdir -p %{buildroot}/%{_includedir}/%{name} -#Comment this look a bit wired to be usefull sub-dir should also needed +#Comment this look a bit wired to be useful sub-dir should also needed # agg, etc cp *.h %{buildroot}/%{_includedir}/%{name}/ @@ -321,9 +272,9 @@ find ./mapscript/ -type f -iname "*.p[ly]" -exec chmod -x {} \; find ./mapscript/ -type f -iname "*.rb" -exec chmod -x {} \; find ./mapscript/ -type f -iname "*.dist" -exec chmod -x {} \; -cd ../build +cd build %makeinstall DESTDIR="%{buildroot}" -cd ../%{name}-%{fileversion} +cd .. mkdir -p %{buildroot}%{_sysconfdir}/php5/conf.d/ cat > %{buildroot}%{_sysconfdir}/php5/conf.d/mapscript.ini <