From b12546fab36afcf44f909287b2e2ef7a94f815e478a90cdf72dddf345754d059 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 30 May 2017 09:40:15 +0000 Subject: [PATCH 1/5] Accepting request 499637 from home:pluskalm:branches:Application:Geo OBS-URL: https://build.opensuse.org/request/show/499637 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/geos?expand=0&rev=17 --- geos-3.5.1.tar.bz2 | 3 - geos-3.6.1.tar.bz2 | 3 + geos.changes | 27 +++++++++ geos.ini | 1 - geos.spec | 133 ++++++--------------------------------------- libruby.patch | 32 +++++++---- 6 files changed, 66 insertions(+), 133 deletions(-) delete mode 100644 geos-3.5.1.tar.bz2 create mode 100644 geos-3.6.1.tar.bz2 delete mode 100644 geos.ini diff --git a/geos-3.5.1.tar.bz2 b/geos-3.5.1.tar.bz2 deleted file mode 100644 index 40ca6ca..0000000 --- a/geos-3.5.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6bb0a7ba0e142b1e952fae9d946b2b532fa05a5c384e458f7cb8990e1fcac32 -size 1930928 diff --git a/geos-3.6.1.tar.bz2 b/geos-3.6.1.tar.bz2 new file mode 100644 index 0000000..c96bab9 --- /dev/null +++ b/geos-3.6.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a2e4e3a7a09a7cfda3211d0f4a235d9fd3176ddf64bd8db14b4ead266189fc5 +size 1833434 diff --git a/geos.changes b/geos.changes index b5a85fc..dfe0629 100644 --- a/geos.changes +++ b/geos.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Mon May 29 12:40:48 UTC 2017 - mpluskal@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 + ------------------------------------------------------------------- Wed Dec 7 12:50:34 UTC 2016 - bruno@ioda-net.ch diff --git a/geos.ini b/geos.ini deleted file mode 100644 index f8fa338..0000000 --- a/geos.ini +++ /dev/null @@ -1 +0,0 @@ -extension=geos.so diff --git a/geos.spec b/geos.spec index aeacf56..cc6d9e9 100644 --- a/geos.spec +++ b/geos.spec @@ -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 @@ Group: Development/Libraries/C and C++ 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 @@ functions such as IsValid() 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 @@ predicate functions and spatial operators, as well as specific JTS topology functions such as IsValid() This package contains ruby bindings for Geometry Engine. -%endif %package devel Summary: Development files for GEOS @@ -136,85 +105,30 @@ functions such as IsValid() 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 - + --disable-static \ + --enable-ruby \ + --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 +#%ifarch %{ix86} x86_64 %check make %{?_smp_mflags} check -%endif -%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 @@ -229,7 +143,7 @@ chrpath --delete %{buildroot}%{_libdir}/php5/extensions/%{name}.so %files -n libgeos_c1 %defattr(-,root,root) %doc COPYING -%{_libdir}/libgeos_c.so.* +%{_libdir}/libgeos_c.so* %files -n python-%{name} %defattr(-,root,root) @@ -237,21 +151,10 @@ chrpath --delete %{buildroot}%{_libdir}/php5/extensions/%{name}.so %{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 @@ chrpath --delete %{buildroot}%{_libdir}/php5/extensions/%{name}.so %{_libdir}/lib%{name}.so %{_libdir}/lib%{name}_c.so -%files doc -%defattr(-,root,root) -%doc doc/doxygen_docs - %changelog diff --git a/libruby.patch b/libruby.patch index 66a67ec..3204855 100644 --- a/libruby.patch +++ b/libruby.patch @@ -2,9 +2,11 @@ Description: Fix libtool in order to avoid a FTBFS. RUBY_EXTENSION_DIR fix by Christian Hofstaedtler . Author: Francesco Paolo Lovergine 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 @@ Bug-Debian: https://bugs.debian.org/735652 # 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 @@ Bug-Debian: https://bugs.debian.org/735652 # 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 @@ Bug-Debian: https://bugs.debian.org/735652 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 From 3a56ab7b546998bd08479823c6038e4b7b846c5f1beaa1d36a8109d1b4c25137 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 30 May 2017 09:40:45 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Application:Geo/geos?expand=0&rev=18 --- geos.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geos.spec b/geos.spec index cc6d9e9..7a5a89d 100644 --- a/geos.spec +++ b/geos.spec @@ -118,7 +118,7 @@ make %{?_smp_mflags} # tests fail with older releases and non-intel architectures # while this was reported to upstream, there has been no reply -#%ifarch %{ix86} x86_64 +%ifarch %{ix86} x86_64 %check make %{?_smp_mflags} check #%endif From 67d7478dddc4f5e3147238dcf871c69cbc9e8762ae394d1826a7955363d4e771 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 30 May 2017 09:42:31 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Application:Geo/geos?expand=0&rev=19 --- geos.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geos.spec b/geos.spec index 7a5a89d..b197541 100644 --- a/geos.spec +++ b/geos.spec @@ -121,7 +121,7 @@ make %{?_smp_mflags} %ifarch %{ix86} x86_64 %check make %{?_smp_mflags} check -#%endif +%endif %install %make_install From 81e5289e37bb5796a1a3cb041c39abb07883e7c24b940c1d6784bc811009afc7 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 1 Jun 2017 12:48:52 +0000 Subject: [PATCH 4/5] + 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) http://git.osgeo.org/gogs/geos/php-geos (#765) OBS-URL: https://build.opensuse.org/package/show/Application:Geo/geos?expand=0&rev=20 --- geos.changes | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/geos.changes b/geos.changes index dfe0629..a394696 100644 --- a/geos.changes +++ b/geos.changes @@ -3,14 +3,14 @@ Mon May 29 12:40:48 UTC 2017 - mpluskal@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) + + 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) + http://git.osgeo.org/gogs/geos/php-geos (#765) * New things: + CAPI: GEOSGeom_{get,set}UserData (Rashad Kanavath) + CAPI: GEOSGeom_{set,get}Precision (#713) From 91996197bb882ffedcef0696beefba7150b0f9556f261b4796b117c9ac98b5a3 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 2 Jun 2017 08:47:13 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Application:Geo/geos?expand=0&rev=21 --- geos.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/geos.spec b/geos.spec index b197541..a810eb0 100644 --- a/geos.spec +++ b/geos.spec @@ -138,12 +138,12 @@ find %{buildroot} -type f \( -name '*.a' -o -name '*.la' \) -delete -print %files -n libgeos-%{uver} %defattr(-,root,root) %doc COPYING -%{_libdir}/libgeos-%{version}.so* +%{_libdir}/libgeos-%{version}.so %files -n libgeos_c1 %defattr(-,root,root) %doc COPYING -%{_libdir}/libgeos_c.so* +%{_libdir}/libgeos_c.so.* %files -n python-%{name} %defattr(-,root,root)