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

reinstate mapserver-7.6.1-fix_python_install_path.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=129
This commit is contained in:
Jan Engelhardt 2022-04-04 14:15:10 +00:00 committed by Git OBS Bridge
parent ebdf301592
commit e9e2422fff
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mapserver-7.6.1-fix_python_install_path.patch
View File

@ -1,3 +1,9 @@
# PATCH-FIX-UPSTREAM mapserver-7.6.1-fix_python_install_path.patch fixing python installation path badly defaulting to arch independent location
There is a _mapserver.so file, which means the installation has to happen to sitearch.
This patch makes it so (i.e. installation to /usr/lib64/python... rather than
/usr/lib/python...)
diff -Nur mapserver-7.6.3/mapscript/python/CMakeLists.txt new/mapscript/python/CMakeLists.txt diff -Nur mapserver-7.6.3/mapscript/python/CMakeLists.txt new/mapscript/python/CMakeLists.txt
--- mapserver-7.6.3/mapscript/python/CMakeLists.txt 2021-04-30 23:26:25.000000000 +0200 --- mapserver-7.6.3/mapscript/python/CMakeLists.txt 2021-04-30 23:26:25.000000000 +0200
+++ new/mapscript/python/CMakeLists.txt 2021-05-31 20:53:16.269084059 +0200 +++ new/mapscript/python/CMakeLists.txt 2021-05-31 20:53:16.269084059 +0200

5
mapserver.spec
View File

@ -42,8 +42,7 @@ Source9: %{name}-rpmlintrc
# - /usr/share/cmake/Modules/FindPostgreSQL.cmake is silly # - /usr/share/cmake/Modules/FindPostgreSQL.cmake is silly
# (the postgresql version list is manual), so no postgresql # (the postgresql version list is manual), so no postgresql
# - swig 4.0 can't do php8, gotta wait for 4.1 so no php # - swig 4.0 can't do php8, gotta wait for 4.1 so no php
# PATCH-FIX-UPSTREAM mapserver-7.6.1-fix_python_install_path.patch fixing python installation path badly defaulting to arch independent location Patch0: mapserver-7.6.1-fix_python_install_path.patch
##Patch0: mapserver-7.6.1-fix_python_install_path.patch
BuildRequires: FastCGI-devel BuildRequires: FastCGI-devel
BuildRequires: apache2-devel BuildRequires: apache2-devel
BuildRequires: autoconf BuildRequires: autoconf
@ -362,7 +361,7 @@ chmod a+x "%{buildroot}/%{_libdir}/libjavamapscript.so"
%doc mapscript/python/README.rst %doc mapscript/python/README.rst
%doc mapscript/python/examples %doc mapscript/python/examples
%doc mapscript/python/tests %doc mapscript/python/tests
%{python3_sitelib}/* %{python3_sitearch}/*
%endif %endif
%files -n libjavamapscript %files -n libjavamapscript