diff --git a/geos-3.8.1.tar.bz2 b/geos-3.8.1.tar.bz2 deleted file mode 100644 index 4dd6a39..0000000 --- a/geos-3.8.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4258af4308deb9dbb5047379026b4cd9838513627cb943a44e16c40e42ae17f7 -size 2505407 diff --git a/geos-3.9.0.tar.bz2 b/geos-3.9.0.tar.bz2 new file mode 100644 index 0000000..22145db --- /dev/null +++ b/geos-3.9.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd8082cf12f45f27630193c78bdb5a3cba847b81e72b20268356c2a4fc065269 +size 4710957 diff --git a/geos.changes b/geos.changes index 2eaaf20..acbbda0 100644 --- a/geos.changes +++ b/geos.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Thu Jan 7 17:19:28 UTC 2021 - Bruno Friedmann + +- Update to version 3.9.0 + + New things + - OverlayNG engine from JTS, now the default (Martin Davis, Paul Ramsey) + - MaximumInscribedCircle and LargestEmptyCircle (JTS-530, Paul Ramsey) + - CAPI: Fixed precision overlay operations (Sandro Santilli) + - CAPI: GEOSPreparedNearestPoints (#1007, Sandro Santilli) + - CAPI: GEOSPreparedDistance (#1066, Sandro Santilli) + - CAPI: GEOSGeom_setPrecision uses OverlayNG (Paul Ramsey) + - SimpleSTRTree spatial index implementation (Paul Ramsey) + - Add support for pkg-config for GEOS C API (#1073, Mike Taves) + + Improvements: + - Stack allocate segments in OverlapUnion (Paul Ramsey) + - Improve performance of GEOSisValid (Dan Baston) + - Update geos-config tool for consistency + and escape paths (https://git.osgeo.org/gitea/geos/geos/pulls/99) + changes mostly affect CMake MSVC builds (#1015, Mike Taves) + - Testing on Rasberry Pi 32-bit (berrie) (#1017, Bruce Rindahl, Regina Obe) + - Replace ttmath with JTS DD double-double implementation (Paul Ramsey) + - Fix bug in DistanceOp for geometries with empty components (#1026, Paul Ramsey) + - Remove undefined behaviour in CAPI (#1021, Greg Troxel) + - Fix buffering issue (#1022, JTS-525, Paul Ramsey) + - MinimumBoundingCircle.getMaximumDiameter fix (JTS-533, Paul Ramsey) + + Changes: + - Drop SWIG bindings, including for Ruby and Python (#1076, Mike Taves) +- Packaging: + + Remove ruby related package and related patch libruby.patch + + spec-clean mini (copyright year) + ------------------------------------------------------------------- Sat May 9 07:36:35 UTC 2020 - Bruno Friedmann diff --git a/geos.spec b/geos.spec index cedd2a1..9492306 100644 --- a/geos.spec +++ b/geos.spec @@ -1,7 +1,7 @@ # # spec file for package geos # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,9 @@ # -%define uver 3_8_1 +%define uver 3_9_0 Name: geos -Version: 3.8.1 +Version: 3.9.0 Release: 0 Summary: Geometry Engine - Open Source License: LGPL-2.1-only @@ -26,12 +26,9 @@ Group: Development/Libraries/C and C++ URL: https://trac.osgeo.org/geos/ Source0: https://download.osgeo.org/%{name}/%{name}-%{version}.tar.bz2 Source1: %{name}-config.1 -Patch0: libruby.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig -BuildRequires: ruby-devel -BuildRequires: swig %description GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology @@ -61,20 +58,6 @@ Obsoletes: geos < %{version}-%{release} This subpackage contains a shared library providing a C linkage interface for the (C++) GEOS library. -%package -n ruby-%{name} -Summary: Ruby bindings for Geometry Engine -Group: Development/Languages/Ruby -Requires: ruby(abi) >= %{rb_ver} - -%description -n ruby-%{name} -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 -predicate functions and spatial operators, as well as specific JTS topology -functions such as IsValid() - -This package contains ruby bindings for Geometry Engine. - %package devel Summary: Development files for GEOS Group: Development/Libraries/C and C++ @@ -94,13 +77,9 @@ use GEOS. %prep %setup -q -%patch0 -p1 %build -%configure \ - --disable-static \ - --enable-ruby - +%configure --disable-static make %{?_smp_mflags} # tests fail with older releases and non-intel architectures @@ -131,16 +110,13 @@ find %{buildroot} -type f \( -name '*.a' -o -name '*.la' \) -delete -print %license COPYING %{_libdir}/libgeos_c.so.* -%files -n ruby-%{name} -%license COPYING -%{rb_vendorarchdir}/%{name}.so - %files devel %license COPYING %doc AUTHORS NEWS README.md ChangeLog %{_mandir}/man1/%{name}-config.1%{ext_man} %{_bindir}/%{name}-config %{_includedir}/* +%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/lib%{name}.so %{_libdir}/lib%{name}_c.so diff --git a/libruby.patch b/libruby.patch deleted file mode 100644 index d1dfcab..0000000 --- a/libruby.patch +++ /dev/null @@ -1,27 +0,0 @@ -Description: RUBY_EXTENSION_DIR fix, use vendorarchdir for Debian package. -Author: Christian Hofstaedtler -Bug-Debian: https://bugs.debian.org/735652 -Forwarded: not-needed - ---- a/configure -+++ b/configure -@@ -19329,7 +19329,7 @@ fi - - RUBY_ARCH_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["archlibdir"] || Config::CONFIG["archlibdir"]'` - -- RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"] || Config::CONFIG["sitearchdir"]'` -+ RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"] || Config::CONFIG["vendorarchdir"]'` - - RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["RUBY_SO_NAME"] || Config::CONFIG["RUBY_SO_NAME"]'` - ---- a/macros/ruby.m4 -+++ b/macros/ruby.m4 -@@ -41,7 +41,7 @@ AC_DEFUN([AC_RUBY_DEVEL], - RUBY_ARCH_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["archlibdir"]] || Config::CONFIG[["archlibdir"]]'` - - dnl Get Ruby extensions directory -- RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["sitearchdir"]] || Config::CONFIG[["sitearchdir"]]'` -+ RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["vendorarchdir"]] || Config::CONFIG[["vendorarchdir"]]'` - - dnl Get Ruby shared library name, this does not include the lib prefix or extension name - RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["RUBY_SO_NAME"]] || Config::CONFIG[["RUBY_SO_NAME"]]'`