From ffdaa81ec73aaf28457e2916b0bf98fd0cbb0de4 Mon Sep 17 00:00:00 2001 From: Markus Date: Jun 26 2020 23:03:54 +0000 Subject: added PDAL support (BZ#1672170) --- diff --git a/grass.spec b/grass.spec index e12cdf8..7619044 100644 --- a/grass.spec +++ b/grass.spec @@ -1,13 +1,9 @@ -# This package depends on automagic byte compilation -# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 -%global _python_bytecompile_extra 1 - %global shortver 78 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: grass Version: 7.8.3 -Release: 5%{?dist} +Release: 7%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?rhel} >= 7 @@ -41,6 +37,7 @@ BuildRequires: gdal-devel BuildRequires: geos-devel BuildRequires: gettext BuildRequires: lapack-devel +BuildRequires: laszip-devel %if (0%{?rhel} > 6 || 0%{?fedora}) BuildRequires: libappstream-glib %endif @@ -96,6 +93,9 @@ BuildRequires: python3-pillow # EPEL6 BuildRequires: python-imaging %endif +BuildRequires: PDAL +BuildRequires: PDAL-libs +BuildRequires: PDAL-devel BuildRequires: readline-devel BuildRequires: sqlite-devel BuildRequires: subversion @@ -138,8 +138,10 @@ Requires: python3-dateutil %if 0%{?rhel} && 0%{?rhel} < 7 Requires: wxPython %else -Requires: python3-wxpython4 +Requires: python3-wxpython4 %endif +Requires: PDAL +Requires: PDAL-libs %if "%{_lib}" == "lib" %global cpuarch 32 @@ -212,6 +214,7 @@ CXXFLAGS="-std=c++98 ${CFLAGS}" --with-freetype \ %endif --with-nls \ + --with-pdal \ --with-readline \ --with-regex \ --with-openmp \ @@ -298,7 +301,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/org.osge #rm -rf %%{buildroot}%%{_prefix}/%%{name}-%%{version} # Finally move entire tree to shortver subdir -#mv %{buildroot}%{_libdir}/%{name}-%{version} %{buildroot}%{_libdir}/%{name}%{shortver} +#mv %%{buildroot}%%{_libdir}/%%{name}-%%{version} %%{buildroot}%%{_libdir}/%%{name}%%{shortver} # rpm macro for version checking (not from buildroot!) mkdir -p ${RPM_BUILD_ROOT}%{macrosdir} @@ -364,6 +367,12 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Fri Jun 26 2020 Markus Neteler - 7.8.3-7 +- added PDAL support + +* Sun Jun 21 2020 Markus Neteler - 7.8.3-6 +- disable automagic byte compilation (BZ#1847153) + * Tue May 26 2020 Markus Neteler - 7.8.3-5 - fixed wxPython for F33 (BZ#1836761)