From a443c9eb2597374aca7f59d166f26c4fe6bafdc0755a1a587c3ebba8470703a2 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 8 Oct 2019 06:53:22 +0000 Subject: [PATCH 1/2] Accepting request 735519 from home:bruno_friedmann:branches:Application:Geo - Fix build error on TW due to boo#1153146 poppler missing boost devel OBS-URL: https://build.opensuse.org/request/show/735519 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=101 --- gdal.changes | 6 ++++++ gdal.spec | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gdal.changes b/gdal.changes index 74de3bf..e89f514 100644 --- a/gdal.changes +++ b/gdal.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Oct 6 12:00:05 UTC 2019 - Bruno Friedmann + +- Fix build error on TW due to boo#1153146 poppler missing boost + devel + ------------------------------------------------------------------- Thu Sep 5 18:50:20 UTC 2019 - Stefan Brüns diff --git a/gdal.spec b/gdal.spec index 3c9e935..79073b3 100644 --- a/gdal.spec +++ b/gdal.spec @@ -66,10 +66,10 @@ BuildRequires: python3-setuptools BuildRequires: swig BuildRequires: unixODBC-devel BuildRequires: pkgconfig(OpenCL) +BuildRequires: pkgconfig(expat) >= 1.95.0 BuildRequires: pkgconfig(freexl) BuildRequires: pkgconfig(json) BuildRequires: pkgconfig(json-c) -BuildRequires: pkgconfig(expat) >= 1.95.0 BuildRequires: pkgconfig(libgeotiff) >= 1.2.1 BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(liblzma) @@ -100,6 +100,9 @@ BuildRequires: ERDAS-ECW_JPEG_2000_SDK-devel BuildRequires: libecwj2-devel %endif %endif +# Fix libpoppler 0.81 +# boo#1153146 (once fixed remove this) +BuildRequires: libboost_headers-devel %description GDAL is a translator library for raster geospatial data formats that From 5ae26b2a16914912a4cbe5bb6ef551fd19aa154e9c5f42558f075703d445e103 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 10 Oct 2019 09:46:07 +0000 Subject: [PATCH 2/2] - Spec file cleanups - Remove poppler boost dependnecy - Enable LTO and zstd OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=102 --- gdal.changes | 7 +++++++ gdal.spec | 17 +++++------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gdal.changes b/gdal.changes index e89f514..539ba6a 100644 --- a/gdal.changes +++ b/gdal.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Oct 10 08:26:00 UTC 2019 - Martin Pluskal + +- Spec file cleanups +- Remove poppler boost dependnecy +- Enable LTO and zstd + ------------------------------------------------------------------- Sun Oct 6 12:00:05 UTC 2019 - Bruno Friedmann diff --git a/gdal.spec b/gdal.spec index 79073b3..d1b5126 100644 --- a/gdal.spec +++ b/gdal.spec @@ -30,8 +30,7 @@ Version: 3.0.1 Release: 0 Summary: GDAL/OGR - a translator library for raster and vector geospatial data formats License: MIT AND BSD-3-Clause AND SUSE-Public-Domain -Group: Development/Libraries/C and C++ -URL: http://www.gdal.org/ +URL: https://www.gdal.org/ Source0: http://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{version}.tar.xz Source1: http://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{version}.tar.xz.md5 Patch0: gdal-perl.patch @@ -54,6 +53,7 @@ BuildRequires: giflib-devel BuildRequires: hdf5-devel BuildRequires: lapack-devel BuildRequires: libtool +BuildRequires: libzstd-devel BuildRequires: mysql-devel BuildRequires: opencl-headers BuildRequires: perl-ExtUtils-MakeMaker @@ -100,9 +100,6 @@ BuildRequires: ERDAS-ECW_JPEG_2000_SDK-devel BuildRequires: libecwj2-devel %endif %endif -# Fix libpoppler 0.81 -# boo#1153146 (once fixed remove this) -BuildRequires: libboost_headers-devel %description GDAL is a translator library for raster geospatial data formats that @@ -114,7 +111,6 @@ vector data. %package devel Summary: GDAL library header files -Group: Development/Languages/C and C++ Requires: lib%{name}%{soversion} = %{version} Requires: pkgconfig(libopenjp2) Provides: lib%{name}%{soversion}-devel = %{version} @@ -125,7 +121,6 @@ Development Libraries for the GDAL file format library %package -n lib%{name}%{soversion} Summary: GDAL static libraries -Group: System/Libraries %description -n lib%{name}%{soversion} GDAL and OGR are translator libraries for raster and vector geospatial data @@ -134,7 +129,6 @@ application for all supported formats. %package -n perl-%{name} Summary: Perl bindings for GDAL -Group: Development/Languages/Perl Requires: %{name} = %{version}-%{release} %{perl_requires} @@ -143,7 +137,6 @@ Perl bindings for GDAL - Geo::GDAL, Geo::OGR and Geo::OSR modules. %package -n python2-%{pypi_package_name} Summary: GDAL Python module -Group: Development/Languages/Python Requires: %{name} = %{version}-%{release} # Renaming to uppercase 'GDAL' during 2.4.0; previously used lowercase Provides: python2-%{name} = %{version} @@ -156,7 +149,6 @@ The GDAL python modules provide support to handle multiple GIS file formats. %package -n python3-%{pypi_package_name} Summary: GDAL Python3 module -Group: Development/Languages/Python Requires: %{name} = %{version}-%{release} Provides: python3-%{name} = %{version} Obsoletes: python3-%{name} < %{version} @@ -169,7 +161,7 @@ The GDAL python modules provide support to handle multiple GIS file formats. %autopatch -p1 # Set the right (build) libproj.so version, use the upper found version. -PROJSOVER=$(ls -1 %_libdir/libproj.so.?? | tail -n1 | awk -F '.' '{print $3}') +PROJSOVER=$(ls -1 %{_libdir}/libproj.so.?? | tail -n1 | awk -F '.' '{print $3}') sed -i "s,# define LIBNAME \"libproj.so\",# define LIBNAME \"libproj.so.${PROJSOVER}\",g" ogr/ogrct.cpp # Fix mandir @@ -257,7 +249,8 @@ autoreconf -fi --without-hdf4 \ --with-hdf5 \ --with-webp \ - --disable-rpath + --disable-rpath \ + --enable-lto # regenerate where needed for M in perl python;