From e9e2422fffe7a41161c2967d18d7f7bf5aa69084cdf8475e0178ca4eb1d9c310 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 4 Apr 2022 14:15:10 +0000 Subject: [PATCH] reinstate mapserver-7.6.1-fix_python_install_path.patch OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=129 --- mapserver-7.6.1-fix_python_install_path.patch | 6 ++++++ mapserver.spec | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mapserver-7.6.1-fix_python_install_path.patch b/mapserver-7.6.1-fix_python_install_path.patch index ddd869c..6081462 100644 --- a/mapserver-7.6.1-fix_python_install_path.patch +++ b/mapserver-7.6.1-fix_python_install_path.patch @@ -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 --- 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 diff --git a/mapserver.spec b/mapserver.spec index f3aefd9..2c0580b 100644 --- a/mapserver.spec +++ b/mapserver.spec @@ -42,8 +42,7 @@ Source9: %{name}-rpmlintrc # - /usr/share/cmake/Modules/FindPostgreSQL.cmake is silly # (the postgresql version list is manual), so no postgresql # - 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: apache2-devel BuildRequires: autoconf @@ -362,7 +361,7 @@ chmod a+x "%{buildroot}/%{_libdir}/libjavamapscript.so" %doc mapscript/python/README.rst %doc mapscript/python/examples %doc mapscript/python/tests -%{python3_sitelib}/* +%{python3_sitearch}/* %endif %files -n libjavamapscript