pool/geos
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- Packaging:
  + refresh patch libruby with upstream debian for 3.7.1
  + remove python as state upstream this not supported since 
    version 3 (use Shapely or libgeos_c)
- Update to version 3.7.1
  + Bug fixes / improvements
    * Fix crash in GEOSCoordSeq_isCCW with empty coordseq
      (#927, Sergey Fedoseev)
    * Fix crash in GEOSInterpolate with empty LineString
      (#926, Sergey Fedoseev)
    * Fix crash in GEOSUnaryUnion with empty LineString
      (#928, Sergey Fedoseev)
    * Fix memory leak in SIRtree::insert (#919, Dan Baston)
    * Reduce required autoconf to 2.63
      (#56, John Harvey)
    * Fix incorrect return values on error from GEOSLength
      GEOSisValidDetail (#941, Dan Baston)
- Changes in 3.7.0
  + New things:
    * CAPI: GEOSDistanceIndexed (#795, Dan Baston)
    * CAPI: GEOSCoordSeq_isCCW (#870, Dan Baston)
    * CAPI: GEOSGeom_getXMin, GEOSGeom_getXMax,
            GEOSGeom_getYMin, GEOSGeom_getYMax (#871, Dan Baston)
    * CAPI: GEOSFrechetDistance (#797, Shinichi SUGIYAMA)
    * CAPI: GEOSReverse (#872, Dan Baston)
    * CAPI: GEOSGeomGetZ (#581, J Smith)
  + Improvements
    * Interruptible snap operation (Paul Ramsey)
    * Numerous packaging, doc, and build changes
      (Debian group: Bas Couwenberg, Francesco Paolo Lovergine)

OBS-URL: https://build.opensuse.org/request/show/677266
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/geos?expand=0&rev=28
This commit is contained in:
Martin Pluskal 2019-02-19 07:59:20 +00:00 committed by Git OBS Bridge
parent 9db988df87
commit 9188398b22
5 changed files with 88 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
geos-3.6.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:045a13df84d605a866602f6020fc6cbf8bf4c42fb50de237a08926e1d7d7652a
size 2030705

3
geos-3.7.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0006c7b49eaed016b9c5c6f872417a7d7dc022e069ddd683335793d905a8228c
size 2055129

66
geos.changes
View File

@ -1,3 +1,69 @@
-------------------------------------------------------------------
Mon Feb 18 20:05:25 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>
- Packaging:
+ refresh patch libruby with upstream debian for 3.7.1
+ remove python as state upstream this not supported since
version 3 (use Shapely or libgeos_c)
- Update to version 3.7.1
+ Bug fixes / improvements
* Fix crash in GEOSCoordSeq_isCCW with empty coordseq
(#927, Sergey Fedoseev)
* Fix crash in GEOSInterpolate with empty LineString
(#926, Sergey Fedoseev)
* Fix crash in GEOSUnaryUnion with empty LineString
(#928, Sergey Fedoseev)
* Fix memory leak in SIRtree::insert (#919, Dan Baston)
* Reduce required autoconf to 2.63
(#56, John Harvey)
* Fix incorrect return values on error from GEOSLength
GEOSisValidDetail (#941, Dan Baston)
- Changes in 3.7.0
+ New things:
* CAPI: GEOSDistanceIndexed (#795, Dan Baston)
* CAPI: GEOSCoordSeq_isCCW (#870, Dan Baston)
* CAPI: GEOSGeom_getXMin, GEOSGeom_getXMax,
GEOSGeom_getYMin, GEOSGeom_getYMax (#871, Dan Baston)
* CAPI: GEOSFrechetDistance (#797, Shinichi SUGIYAMA)
* CAPI: GEOSReverse (#872, Dan Baston)
* CAPI: GEOSGeomGetZ (#581, J Smith)
+ Improvements
* Interruptible snap operation (Paul Ramsey)
* Numerous packaging, doc, and build changes
(Debian group: Bas Couwenberg, Francesco Paolo Lovergine)
(NetBSD: Greg Troxel)
* Allow static library with C API for CMake builds (#878, Dakota Hawkins)
+ C++ API changes:
* Require defining USE_UNSTABLE_GEOS_CPP_API for use without
warnings.
* Make C++11 required (Mateusz Loskot)
* Use C++11 unique_ptr, nullptr, and override constructs
(Mateusz Loskot)
* C++11 standard delete on noncopyable
(#851, Vicky Vergara)
* Fix CommonBits::getBit to correctly handle i >= 32
(#834, Kurt Schwehr)
- Changes in 3.7.0rc2
+ Fixes / enhancements since 3.7.0rc1
* Drop ? from extended regular expression,
so that the expression strictly conforms to the POSIX ERE rules.
(#917, Greg Troxel, Bas Couwenberg)
* include .editorconfig in tar ball,
fixes Cmake on VS (#920, Jeff Mckenna, Regina Obe)
* Ignore error in CoordinateArraySequenceFactoryTest
failing on FreeBSD/macOS Clang (#894)
- Changes in 3.7.0rc1
+ Fixes / enhancements since 3.7.0beta2
* Avoid segfault when querying empty tree (#730, framm)
* Collection with Empty components crashes overlay (#782, Dan Baston)
* Allow static library with C API for CMake builds (#878, Dakota Hawkins)
- Changes in 3.7.0beta2
+ Fixes since 3.7.0beta1
* Fix infinite loop in GEOSClipByRect (#865, Dan Baston)
* Make GEOSException inherit from std::runtime_error
to address clang warnings (Dan Baston)
* Add missing CMake files to tarball (#895, Regina Obe)
-------------------------------------------------------------------
Thu Mar 8 12:08:09 UTC 2018 - mpluskal@suse.com

35
geos.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package geos
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,13 +12,13 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define uver 3_6_2
%define uver 3_7_1
Name: geos
Version: 3.6.2
Version: 3.7.1
Release: 0
Summary: Geometry Engine - Open Source
License: LGPL-2.1-only
@ -32,7 +32,6 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: ruby-devel
BuildRequires: swig
BuildRequires: pkgconfig(python2)
%description
GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology
@ -62,21 +61,6 @@ Obsoletes: geos < %{version}-%{release}
This subpackage contains a shared library providing a C linkage
interface for the (C++) GEOS library.
%package -n python2-%{name}
Summary: Python bindings for Geometry Engine
Group: Development/Languages/Python
Provides: python-%{name} = %{version}
Obsoletes: python-%{name} < %{version}
%description -n python2-%{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 python bindings for Geometry Engine.
%package -n ruby-%{name}
Summary: Ruby bindings for Geometry Engine
Group: Development/Languages/Ruby
@ -115,8 +99,8 @@ use GEOS.
%build
%configure \
--disable-static \
--enable-ruby \
--enable-python
--enable-ruby
make %{?_smp_mflags}
# tests fail with older releases and non-intel architectures
@ -147,18 +131,13 @@ find %{buildroot} -type f \( -name '*.a' -o -name '*.la' \) -delete -print
%license COPYING
%{_libdir}/libgeos_c.so.*
%files -n python2-%{name}
%license COPYING
%{python_sitelib}/*
%{python_sitearch}/*
%files -n ruby-%{name}
%license COPYING
%{rb_vendorarchdir}/%{name}.so
%files devel
%license COPYING
%doc AUTHORS NEWS README TODO
%doc AUTHORS NEWS README.md TODO
%{_mandir}/man1/%{name}-config.1%{ext_man}
%{_bindir}/%{name}-config
%{_includedir}/*

53
libruby.patch
View File

@ -1,52 +1,23 @@
Description: Fix libtool in order to avoid a FTBFS.
RUBY_EXTENSION_DIR fix by Christian Hofstaedtler <zeha@debian.org>.
Author: Francesco Paolo Lovergine <frankie@debian.org>
Description: RUBY_EXTENSION_DIR fix, use vendorarchdir for Debian package.
Author: Christian Hofstaedtler <zeha@debian.org>
Bug-Debian: https://bugs.debian.org/735652
Index: geos-3.6.1/swig/ruby/Makefile.am
===================================================================
--- geos-3.6.1.orig/swig/ruby/Makefile.am
+++ geos-3.6.1/swig/ruby/Makefile.am
@@ -22,7 +22,7 @@ AM_CPPFLAGS = -I$(RUBY_INCLUDE_DIR) -I$(
# Build Ruby module as shared library
rubyextensiondir_LTLIBRARIES = geos.la
geos_la_SOURCES = geos_wrap.cxx
-geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la $(RUBY_SO_NAME)
+geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la /usr/lib/$(RUBY_SO_NAME)
Forwarded: not-needed
--- a/configure
+++ b/configure
@@ -19329,7 +19329,7 @@ fi
# Only need to grab the capi header files
geos_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/capi
Index: geos-3.6.1/swig/ruby/Makefile.in
===================================================================
--- geos-3.6.1.orig/swig/ruby/Makefile.in
+++ geos-3.6.1/swig/ruby/Makefile.in
@@ -449,7 +449,7 @@ MAINTAINERCLEANFILES = geos_wrap.cxx
# Build Ruby module as shared library
@ENABLE_RUBY_TRUE@rubyextensiondir_LTLIBRARIES = geos.la
@ENABLE_RUBY_TRUE@geos_la_SOURCES = geos_wrap.cxx
-@ENABLE_RUBY_TRUE@geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la $(RUBY_SO_NAME)
+@ENABLE_RUBY_TRUE@geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la /usr/lib/$(RUBY_SO_NAME)
# Only need to grab the capi header files
@ENABLE_RUBY_TRUE@geos_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/capi
Index: geos-3.6.1/configure
===================================================================
--- geos-3.6.1.orig/configure
+++ geos-3.6.1/configure
@@ -18581,7 +18581,7 @@ fi
RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["libdir"] || Config::CONFIG["libdir"]'`
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"]'`
Index: geos-3.6.1/macros/ruby.m4
===================================================================
--- geos-3.6.1.orig/macros/ruby.m4
+++ geos-3.6.1/macros/ruby.m4
@@ -35,7 +35,7 @@ AC_DEFUN([AC_RUBY_DEVEL],
RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["libdir"]] || Config::CONFIG[["libdir"]]'`
--- 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"]]'`