Hello community, here is the log from the commit of package geos for openSUSE:Factory checked in at 2017-07-21 22:44:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geos (Old) and /work/SRC/openSUSE:Factory/.geos.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geos" Fri Jul 21 22:44:34 2017 rev:7 rq:500554 version:3.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/geos/geos.changes 2016-12-10 18:30:30.794478904 +0100 +++ /work/SRC/openSUSE:Factory/.geos.new/geos.changes 2017-07-21 22:44:41.344594137 +0200 @@ -1,0 +2,27 @@ +Mon May 29 12:40:48 UTC 2017 - mplus...@suse.com + +- Update to version 3.6.1: + * Bug fixes / improvements + + Fix GEOSSTRtree_nearest_r signature and add implementation (#796) + + Fix --static-clibs and --static-cclibs returns from geos-config + + Fix WKB representation of empty polygon (#680). + + Fix empty GEOSSimplify return on inner ring collapse (#741) +- Changes in 3.6.0 + * Important / Breaking Changes: + + The PHP binding moved to its own repository: + http://git.osgeo.org/gogs/geos/php-geos (#765) + * New things: + + CAPI: GEOSGeom_{get,set}UserData (Rashad Kanavath) + + CAPI: GEOSGeom_{set,get}Precision (#713) + + CAPI: GEOSMinimumRotatedRectangle and GEOSMinimumWidth + (#729, Nyall Dawson) + + CAPI: GEOSSTRtree_nearest (#768, Dan Baston) + + CAPI: GEOSMinimumClearance and GEOSMinimumClearanceLine + (#776, Dan Baston) + * C++ API changes: + + Automatic memory management for GeometryFactory objects +- Drop doc and php subpackages +- Drop no longer needed: + * geos.ini + +------------------------------------------------------------------- Old: ---- geos-3.5.1.tar.bz2 geos.ini New: ---- geos-3.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geos.spec ++++++ --- /var/tmp/diff_new_pack.ZEHiug/_old 2017-07-21 22:44:44.164196395 +0200 +++ /var/tmp/diff_new_pack.ZEHiug/_new 2017-07-21 22:44:44.168195831 +0200 @@ -1,7 +1,7 @@ # # spec file for package geos # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -16,9 +16,9 @@ # -%define uver 3_5_1 +%define uver 3_6_1 Name: geos -Version: 3.5.1 +Version: 3.6.1 Release: 0 Summary: Geometry Engine - Open Source License: LGPL-2.1 @@ -26,25 +26,12 @@ Url: http://trac.osgeo.org/geos/ Source0: http://download.osgeo.org/%{name}/%{name}-%{version}.tar.bz2 Source1: %{name}-config.1 -Source2: %{name}.ini Patch0: libruby.patch -BuildRequires: doxygen BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: python-devel -BuildRequires: swig -Provides: libgeos = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1210 -BuildRequires: ruby +BuildRequires: pkgconfig BuildRequires: ruby-devel -%endif -# Dependencies for opensuse but not for SLE-12 -%if 0%{?suse_version} >= 1210 && 0%{?suse_version} != 1315 -BuildRequires: chrpath -BuildRequires: php-devel -BuildRequires: php5-pear-phpunit -%endif +BuildRequires: swig +BuildRequires: pkgconfig(python2) %description GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology @@ -87,23 +74,6 @@ This package contains python bindings for Geometry Engine. -%if 0%{?suse_version} >= 1210 && 0%{?suse_version} != 1315 -%package -n php5-%{name} -Summary: PHP bindings for Geometry Engine -Group: Development/Languages/Other -Requires: php5 >= %{phpversion} - -%description -n php5-%{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 php bindings for Geometry Engine. -%endif - -%if 0%{?suse_version} > 1210 %package -n ruby-%{name} Summary: Ruby bindings for Geometry Engine Group: Development/Languages/Ruby @@ -117,7 +87,6 @@ functions such as IsValid() This package contains ruby bindings for Geometry Engine. -%endif %package devel Summary: Development files for GEOS @@ -136,85 +105,30 @@ This package contains the development files to build applications that use GEOS. -%package doc -Summary: Development documentation for GEOS -Group: Documentation/HTML -%if 0%{?suse_version} > 1210 -BuildArch: noarch -%endif - -%description doc -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 the development documentation for GEOS. - %prep %setup -q %patch0 -p1 %build -# disable internal libtool to avoid hardcoded r-path -%if 0%{?suse_version} > 1210 -for makefile in `find . -type f -name 'Makefile.in'`; do -sed -i 's|@LIBTOOL@|%{_bindir}/libtool|g' $makefile -done -%endif - -# isnan is in math.h, std::isnan is in cmath -sed -i -e 's|= isnan(|= std::isnan(|g' configure -sed -i -e 's|(isnan(|(std::isnan(|g' include/geos/platform.h.in - %configure \ --disable-static \ - %if 0%{?suse_version} > 1210 --enable-ruby \ - %endif - %if 0%{?suse_version} >= 1210 && 0%{?suse_version} != 1315 - --enable-php \ - %endif --enable-python - make %{?_smp_mflags} -# Make doxygen documentation files -cd doc -make %{?_smp_mflags} doxygen-html - # tests fail with older releases and non-intel architectures # while this was reported to upstream, there has been no reply -%if 0%{?suse_version} > 1210 %ifarch %{ix86} x86_64 %check make %{?_smp_mflags} check %endif -%endif %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install - -install -d -m 0755 %{buildroot}%{_mandir}/man1 -install -D -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/ - -%if 0%{?suse_version} >= 1210 && 0%{?suse_version} != 1315 -install -d -m 0755 %{buildroot}%{_sysconfdir}/php.d -install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/php.d/ -%endif - +%make_install +install -Dpm 0644 %{SOURCE1} \ + %{buildroot}%{_mandir}/man1/geos-config.1 # do not ship static libraries or la files -rm -rf %{buildroot}/%{_libdir}/*.a -find %{buildroot} -type f -name "*.la" -delete -print -rm -rf %{buildroot}/%{python_sitearch}/%{name}/*.a -rm -rf %{buildroot}/%{python_sitearch}/%{name}/*.la -rm -rf %{buildroot}/%{rb_vendorarchdir}/*.a -rm -rf %{buildroot}/%{rb_vendorarchdir}/*.la - -%if 0%{?suse_version} >= 1210 && 0%{?suse_version} != 1315 -chrpath --delete %{buildroot}%{_libdir}/php5/extensions/%{name}.so -%endif +find %{buildroot} -type f \( -name '*.a' -o -name '*.la' \) -delete -print %post -n libgeos-%{uver} -p /sbin/ldconfig %postun -n libgeos-%{uver} -p /sbin/ldconfig @@ -224,7 +138,7 @@ %files -n libgeos-%{uver} %defattr(-,root,root) %doc COPYING -%{_libdir}/libgeos-%{version}.so* +%{_libdir}/libgeos-%{version}.so %files -n libgeos_c1 %defattr(-,root,root) @@ -237,21 +151,10 @@ %{python_sitelib}/* %{python_sitearch}/* -%if 0%{?suse_version} >= 1210 && 0%{?suse_version} != 1315 -%files -n php5-%{name} -%defattr(-,root,root) -%doc COPYING -%dir %{_sysconfdir}/php.d -%config %{_sysconfdir}/php.d/%{name}.ini -%{_libdir}/php5/extensions/%{name}.so -%endif - -%if 0%{?suse_version} > 1210 %files -n ruby-%{name} %defattr(-,root,root) %doc COPYING %{rb_vendorarchdir}/%{name}.so -%endif %files devel %defattr(-,root,root) @@ -262,8 +165,4 @@ %{_libdir}/lib%{name}.so %{_libdir}/lib%{name}_c.so -%files doc -%defattr(-,root,root) -%doc doc/doxygen_docs - %changelog ++++++ geos-3.5.1.tar.bz2 -> geos-3.6.1.tar.bz2 ++++++ ++++ 39295 lines of diff (skipped) ++++++ libruby.patch ++++++ --- /var/tmp/diff_new_pack.ZEHiug/_old 2017-07-21 22:44:45.336031092 +0200 +++ /var/tmp/diff_new_pack.ZEHiug/_new 2017-07-21 22:44:45.336031092 +0200 @@ -2,9 +2,11 @@ RUBY_EXTENSION_DIR fix by Christian Hofstaedtler <z...@debian.org>. Author: Francesco Paolo Lovergine <fran...@debian.org> Bug-Debian: https://bugs.debian.org/735652 ---- a/swig/ruby/Makefile.am -+++ b/swig/ruby/Makefile.am -@@ -22,7 +22,7 @@ +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 @@ -13,9 +15,11 @@ # Only need to grab the capi header files geos_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/capi ---- a/swig/ruby/Makefile.in -+++ b/swig/ruby/Makefile.in -@@ -451,7 +451,7 @@ +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 @@ -24,9 +28,11 @@ # Only need to grab the capi header files @ENABLE_RUBY_TRUE@geos_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/capi ---- a/configure -+++ b/configure -@@ -18564,7 +18564,7 @@ +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"]'` @@ -35,9 +41,11 @@ 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 -@@ -35,7 +35,7 @@ +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"]]'` dnl Get Ruby extensions directory
