From 03ab9be6fded42e8d5886c1e2579680a73ef255e790bf10a1b5b301780e2b5f9 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 28 Dec 2021 09:39:39 +0000 Subject: [PATCH 1/2] - Update to version 3.10.1: * Fix mistake in constants used to select WKB flavor in C API (GH489, Paul Ramsey) * Fix crash when reducing precision on a LinearRing (#1135, Paul Ramsey) * Fix GeoJSON crash on invalid input (GH498, Even Rouault) * Use std::sqrt exclusively for Solaris build (Paul Ramsey) * Fix mistaken version numbers in some parts of 3.10.0 (Paul Ramsey) - Changes for version 3.10.0: * Preserve ordering of lines in overlay results (Martin Davis) * Check for invalid geometry before fixing polygonal result in Densifier and DPSimplifier (Martin Davis) * Fix overlay handling of flat interior lines (JTS-685, Martin Davis) * Fix IsValidOp to correctly report invalid nested MultiPolygons (#1112, Martin Davis) * Fix BufferOp to avoid artifacts in certain polygon buffers (#1101, Martin Davis) * Fix IsValidOp to correctly report certain kinds of invalid LinearRings (Martin Davis) * Improve STRtree performance through TemplateSTRtree implementation (Daniel Baston) * Fix DiscreteFrechetDistance to use initial points of input lines (#1128, Martin Davis) * Autoconf build system is dropped in favour of CMake See README.md and INSTALL.md for examples of usage * Libtool is no longer used for in favour of CMake Therefor libgeos.la is no longer built/installed * #1094, #1090: Drop inlines.cpp to address duplicate symbols on many platforms (Regina Obe) * GH475: Do not return NaN from GEOSProjectNormalized_r (Paul Ramsey) * GH442: BufferOp now returns unique_ptr result (Paul Ramsey) - Drop geos-config.1 - Update project and download URL OBS-URL: https://build.opensuse.org/package/show/Application:Geo/geos?expand=0&rev=41 --- geos-3.10.1.tar.bz2 | 3 +++ geos-3.9.1.tar.bz2 | 3 --- geos-config.1 | 31 ------------------------------- geos.changes | 30 ++++++++++++++++++++++++++++++ geos.spec | 44 +++++++++++++++++--------------------------- 5 files changed, 50 insertions(+), 61 deletions(-) create mode 100644 geos-3.10.1.tar.bz2 delete mode 100644 geos-3.9.1.tar.bz2 delete mode 100644 geos-config.1 diff --git a/geos-3.10.1.tar.bz2 b/geos-3.10.1.tar.bz2 new file mode 100644 index 0000000..bf472d8 --- /dev/null +++ b/geos-3.10.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8148eec9636814c8ab0f8f5266ce6f9b914ed65b0d083fc43bb0bbb01f83648 +size 6714713 diff --git a/geos-3.9.1.tar.bz2 b/geos-3.9.1.tar.bz2 deleted file mode 100644 index 24d567d..0000000 --- a/geos-3.9.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7e630507dcac9dc07565d249a26f06a15c9f5b0c52dd29129a0e3d381d7e382a -size 4761372 diff --git a/geos-config.1 b/geos-config.1 deleted file mode 100644 index ea39c11..0000000 --- a/geos-config.1 +++ /dev/null @@ -1,31 +0,0 @@ -.TH "geos-config" "1" "October 25, 2004" "geos-config" "User Commands" -.SH "NAME" -geos\-config \- returns information about installed GEOS libraries and binaries -.SH "SYNOPSIS" -.PP -.B geos\-config -[OPTIONS] -.SH "DESCRIPTION" -.PP -The \fIgeos\-config\fP shell script displays configuration information for installed GEOS libraries and binaries. - -.SH "OPTIONS" -.TP -\fB\-\-prefix\fR -print the prefix used by geos -.TP -\fB\-\-version\fR -print the GEOS version -.TP -\fB\-\-libs\fR -print the linker flags that are necessary to link to GEOS -.TP -\fB\-\-cflags\fR -print the compiler flags that are necessary to compile a -plug\-in -.TP -\fB\-\-includes\fR -show location of C++ header files -.TP -\fB\-\-jtsport\fR -show the version of the Java Topology Suite this version of GEOS was ported from diff --git a/geos.changes b/geos.changes index c23c131..605cc98 100644 --- a/geos.changes +++ b/geos.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Tue Dec 28 08:59:59 UTC 2021 - Martin Pluskal + +- Update to version 3.10.1: + * Fix mistake in constants used to select WKB flavor in C API (GH489, Paul Ramsey) + * Fix crash when reducing precision on a LinearRing (#1135, Paul Ramsey) + * Fix GeoJSON crash on invalid input (GH498, Even Rouault) + * Use std::sqrt exclusively for Solaris build (Paul Ramsey) + * Fix mistaken version numbers in some parts of 3.10.0 (Paul Ramsey) +- Changes for version 3.10.0: + * Preserve ordering of lines in overlay results (Martin Davis) + * Check for invalid geometry before fixing polygonal result in Densifier + and DPSimplifier (Martin Davis) + * Fix overlay handling of flat interior lines (JTS-685, Martin Davis) + * Fix IsValidOp to correctly report invalid nested MultiPolygons (#1112, Martin Davis) + * Fix BufferOp to avoid artifacts in certain polygon buffers (#1101, Martin Davis) + * Fix IsValidOp to correctly report certain kinds of invalid LinearRings (Martin Davis) + * Improve STRtree performance through TemplateSTRtree implementation (Daniel Baston) + * Fix DiscreteFrechetDistance to use initial points of input lines (#1128, Martin Davis) + * Autoconf build system is dropped in favour of CMake + See README.md and INSTALL.md for examples of usage + * Libtool is no longer used for in favour of CMake + Therefor libgeos.la is no longer built/installed + * #1094, #1090: Drop inlines.cpp to address duplicate symbols on many platforms + (Regina Obe) + * GH475: Do not return NaN from GEOSProjectNormalized_r (Paul Ramsey) + * GH442: BufferOp now returns unique_ptr result (Paul Ramsey) +- Drop geos-config.1 +- Update project and download URL + ------------------------------------------------------------------- Tue Nov 16 07:45:45 UTC 2021 - Guillaume GARDET diff --git a/geos.spec b/geos.spec index d6d1ab9..4186756 100644 --- a/geos.spec +++ b/geos.spec @@ -16,17 +16,16 @@ # -%define uver 3_9_1 +%define uver 3_10_1 Name: geos -Version: 3.9.1 +Version: 3.10.1 Release: 0 Summary: Geometry Engine - Open Source License: LGPL-2.1-only Group: Development/Libraries/C and C++ -URL: https://trac.osgeo.org/geos/ +URL: https://libgeos.org Source0: https://download.osgeo.org/%{name}/%{name}-%{version}.tar.bz2 -Source1: %{name}-config.1 -BuildRequires: fdupes +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -79,37 +78,27 @@ use GEOS. %setup -q %build -# Disable inline for armv6/7 - https://trac.osgeo.org/geos/ticket/993 -%configure \ -%ifarch %{arm} - --disable-inline \ -%endif - --disable-static -make %{?_smp_mflags} +%cmake +%cmake_build -# tests fail with older releases and non-intel architectures -# while this was reported to upstream, there has been no reply -%ifarch %{ix86} x86_64 %check -make %{?_smp_mflags} check -%endif +%ctest %install -%make_install -install -Dpm 0644 %{SOURCE1} \ - %{buildroot}%{_mandir}/man1/geos-config.1 -# do not ship static libraries or la files -find %{buildroot} -type f \( -name '*.a' -o -name '*.la' \) -delete -print -%fdupes %{buildroot}%{python_sitelib} +%cmake_install %post -n libgeos-%{uver} -p /sbin/ldconfig %postun -n libgeos-%{uver} -p /sbin/ldconfig %post -n libgeos_c1 -p /sbin/ldconfig %postun -n libgeos_c1 -p /sbin/ldconfig +%files +%license COPYING +%{_bindir}/geosop + %files -n libgeos-%{uver} %license COPYING -%{_libdir}/libgeos-%{version}.so +%{_libdir}/libgeos.so.* %files -n libgeos_c1 %license COPYING @@ -117,11 +106,12 @@ find %{buildroot} -type f \( -name '*.a' -o -name '*.la' \) -delete -print %files devel %license COPYING -%doc AUTHORS NEWS README.md ChangeLog -%{_mandir}/man1/%{name}-config.1%{ext_man} -%{_bindir}/%{name}-config +%doc AUTHORS NEWS README.md +%{_bindir}/geos-config %{_includedir}/* %{_libdir}/pkgconfig/%{name}.pc +%dir %{_libdir}/cmake/GEOS +%{_libdir}/cmake/GEOS/geos-* %{_libdir}/lib%{name}.so %{_libdir}/lib%{name}_c.so From fe4e7009b177f99c1434c19eb8b081206087fae2f59c4817017f1d0b3a18c86a Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 28 Dec 2021 10:33:48 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Application:Geo/geos?expand=0&rev=42 --- geos.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/geos.spec b/geos.spec index 4186756..a0bf243 100644 --- a/geos.spec +++ b/geos.spec @@ -36,11 +36,11 @@ in C++. This includes all the OpenGIS "Simple Features for SQL" spatial predicate functions and spatial operators, as well as specific JTS topology functions such as IsValid(). -%package -n libgeos-%{uver} +%package -n libgeos%{uver} Summary: Geometry Engine library Group: System/Libraries -%description -n libgeos-%{uver} +%description -n libgeos%{uver} GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology Suite (JTS). As such, it aims to contain the complete functionality of JTS in C++. This includes all the OpenGIS "Simple Features for SQL" spatial @@ -60,7 +60,7 @@ interface for the (C++) GEOS library. %package devel Summary: Development files for GEOS Group: Development/Libraries/C and C++ -Requires: libgeos-%{uver} = %{version} +Requires: libgeos%{uver} = %{version} Requires: libgeos_c1 = %{version} Provides: lib%{name}-devel = %{version} @@ -82,13 +82,15 @@ use GEOS. %cmake_build %check +# path needs to be exported otherwise unit tests will fail +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir} %ctest %install %cmake_install -%post -n libgeos-%{uver} -p /sbin/ldconfig -%postun -n libgeos-%{uver} -p /sbin/ldconfig +%post -n libgeos%{uver} -p /sbin/ldconfig +%postun -n libgeos%{uver} -p /sbin/ldconfig %post -n libgeos_c1 -p /sbin/ldconfig %postun -n libgeos_c1 -p /sbin/ldconfig @@ -96,7 +98,7 @@ use GEOS. %license COPYING %{_bindir}/geosop -%files -n libgeos-%{uver} +%files -n libgeos%{uver} %license COPYING %{_libdir}/libgeos.so.*