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

- Rework BuildRequires as only libpq is really needed
  + Indicate -DPOSTGRESQL_INCLUDE_DIR build flag 
  + Remove postgresql-devel postgresql-server-devel buildrequires
- Fix a sed instruction to use -i

OBS-URL: https://build.opensuse.org/request/show/848669
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/PDAL?expand=0&rev=20
This commit is contained in:
Martin Pluskal 2020-11-18 07:14:33 +00:00 committed by Git OBS Bridge
parent 24544f5a08
commit fe902fb11f
2 changed files with 10 additions and 3 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Nov 15 08:15:50 UTC 2020 - Bruno Friedmann <bruno@ioda-net.ch>
- Rework BuildRequires as only libpq is really needed
+ Indicate -DPOSTGRESQL_INCLUDE_DIR build flag
+ Remove postgresql-devel postgresql-server-devel buildrequires
- Fix a sed instruction to use -i
-------------------------------------------------------------------
Mon Sep 21 13:15:28 UTC 2020 - Dirk Stoecker <opensuse@dstoecker.de> 2.2.0

View File

@ -57,8 +57,6 @@ BuildRequires: libspatialindex-devel
BuildRequires: libtiff-devel
BuildRequires: libxml2-devel
BuildRequires: pkgconfig
BuildRequires: postgresql-devel
BuildRequires: postgresql-server-devel
BuildRequires: proj
# We don't have it yet
# BuildRequires: pointcloud-devel
@ -166,7 +164,7 @@ PDAL algorithms.
%prep
%setup -q -n %{name}-%{version}-src
# Fix all wrong shebang and move to python3 only
find . -type f -iname "*.py" -exec sed 's,^#!%{_bindir}/env python,#!%{_bindir}/python3,' {} \;
find . -type f -iname "*.py" -exec sed -i 's,^#!%{_bindir}/env python,#!%{_bindir}/python3,' {} \;
#Cleanup spurious perms in documentation
find ./doc/ -type f -exec chmod -v 0644 {} \;
@ -187,6 +185,7 @@ find ./doc/ -type f -iname "*.ai" -delete
-DWITH_LASZIP=ON \
-DWITH_LZMA=ON \
-DLASZIP_INCLUDE_DIR=%{_includedir} \
-DPOSTGRESQL_INCLUDE_DIR=%{_includedir}/pgsql \
-DGEOTIFF_INCLUDE_DIR=%{_includedir}/libgeotiff \
-DBUILD_SHARED_LIBS=ON \
-DNUMPY_INCLUDE_DIR=%{_libdir}/python%{py3_ver}/site-packages/numpy \