commit 3f79e9310e7c051b763df5a924bdd75a7a94fc07
Author: Jan Rękorajski <[email protected]>
Date: Fri Dec 27 20:12:55 2024 +0100
- up to 3.13.0
geos-x32.patch | 109 -------------------------------------------------------
geos.spec | 112 ++++++++++-----------------------------------------------
rubydir.patch | 11 ------
3 files changed, 18 insertions(+), 214 deletions(-)
---
diff --git a/geos.spec b/geos.spec
index 0a60a7b..34785b0 100644
--- a/geos.spec
+++ b/geos.spec
@@ -1,29 +1,19 @@
-#
-# Conditional build:
-%bcond_without ruby # ruby binding
-
Summary: Geometry Engine - Open Source
Summary(pl.UTF-8): GEOS - silnik geometryczny z otwartymi źródłami
Name: geos
-Version: 3.8.3
+Version: 3.13.0
Release: 1
License: LGPL v2.1
Group: Libraries
Source0: http://download.osgeo.org/geos/%{name}-%{version}.tar.bz2
-# Source0-md5: 57e4bde34a4f8aabed096e06a2002c4d
-Patch0: rubydir.patch
-Patch1: %{name}-x32.patch
-URL: https://trac.osgeo.org/geos/
-BuildRequires: autoconf >= 2.63
-BuildRequires: automake
+# Source0-md5: 7dda2ea78f394c7d460f6e81a215087c
+URL: https://libgeos.org/
+BuildRequires: cmake
BuildRequires: libstdc++-devel >= 6:4.7
-BuildRequires: python
-BuildRequires: python-devel
-BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.519
-%{?with_ruby:BuildRequires: ruby-devel}
-BuildRequires: swig-python >= 1.3.29
-%{?with_ruby:BuildRequires: swig-ruby >= 1.3.40-3}
+Obsoletes: geos-static < 3.13.0
+Obsoletes: python-geos < 3.13.0
+Obsoletes: ruby-geos < 3.13.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -54,70 +44,21 @@ Header files for GEOS library.
%description devel -l pl.UTF-8
Pliki nagłówkowe biblioteki GEOS.
-%package static
-Summary: Static GEOS library
-Summary(pl.UTF-8): Statyczna biblioteka GEOS
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-
-%description static
-Static GEOS library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka GEOS.
-
-%package -n python-geos
-Summary: Python bindings for Geometry Engine - Open Source
-Summary(pl.UTF-8): Wiązania Pythona do biblioteki GEOS
-Group: Development/Languages/Python
-Requires: %{name} = %{version}-%{release}
-
-%description -n python-geos
-Python bindings for Geometry Engine - Open Source.
-
-%description -n python-geos -l pl.UTF-8
-Wiązania Pythona do biblioteki GEOS.
-
-%package -n ruby-geos
-Summary: Ruby bindings for Geometry Engine - Open Source
-Summary(pl.UTF-8): Wiązania języka Ruby do biblioteki GEOS
-Group: Development/Languages/Python
-Requires: %{name} = %{version}-%{release}
-
-%description -n ruby-geos
-Ruby bindings for Geometry Engine - Open Source.
-
-%description -n ruby-geos -l pl.UTF-8
-Wiązania języka Ruby do biblioteki GEOS.
-
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
-%{__aclocal} -I macros
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- --enable-python \
- %{?with_ruby:--enable-ruby}
+mkdir -p build
+cd build
+%cmake ../
-%{__make} \
- pkglibdir=%{_libdir}
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- pythondir=%{py_sitescriptdir}
-
-%{?with_ruby:%{__rm} $RPM_BUILD_ROOT%{ruby_vendorarchdir}/*.{la,a}}
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/geos/*.{la,a}
-
-%py_postclean
+%{__make} -C build install \
+ DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@ -127,8 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS NEWS README.md
-%attr(755,root,root) %{_libdir}/libgeos-%{version}.so
+%doc AUTHORS NEWS.md README.md
+%attr(755,root,root) %{_bindir}/geosop
+%attr(755,root,root) %{_libdir}/libgeos.so.%{version}
%attr(755,root,root) %{_libdir}/libgeos_c.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libgeos_c.so.1
@@ -137,26 +79,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/geos-config
%attr(755,root,root) %{_libdir}/libgeos.so
%attr(755,root,root) %{_libdir}/libgeos_c.so
-%{_libdir}/libgeos.la
-%{_libdir}/libgeos_c.la
%{_includedir}/geos
%{_includedir}/geos.h
%{_includedir}/geos_c.h
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libgeos.a
-%{_libdir}/libgeos_c.a
-
-%files -n python-geos
-%defattr(644,root,root,755)
-%dir %{py_sitedir}/geos
-%attr(755,root,root) %{py_sitedir}/geos/_geos.so
-%{py_sitescriptdir}/geos
-%{py_sitescriptdir}/geos.pth
-
-%if %{with ruby}
-%files -n ruby-geos
-%defattr(644,root,root,755)
-%attr(755,root,root) %{ruby_vendorarchdir}/geos.so
-%endif
+%{_libdir}/cmake/GEOS
+%{_pkgconfigdir}/geos.pc
diff --git a/geos-x32.patch b/geos-x32.patch
deleted file mode 100644
index 596371f..0000000
--- a/geos-x32.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- geos-3.8.1/include/geos/algorithm/ttmath/ttmathtypes.h.orig
2019-09-18 23:38:19.000000000 +0200
-+++ geos-3.8.1/include/geos/algorithm/ttmath/ttmathtypes.h 2020-11-08
20:39:00.133786117 +0100
-@@ -109,7 +109,7 @@
- */
- #if !defined TTMATH_PLATFORM32 && !defined TTMATH_PLATFORM64
-
-- #if !defined _M_X64 && !defined __x86_64__
-+ #if !defined _M_X64 && !defined __x86_64__ || defined __ILP32__
-
- /*
- other platforms than x86 and amd64 are not recognized
at the moment
---- geos-3.8.1/include/geos/algorithm/ttmath/ttmathuint_x86.h.orig
2019-09-18 23:38:19.000000000 +0200
-+++ geos-3.8.1/include/geos/algorithm/ttmath/ttmathuint_x86.h 2020-11-08
21:56:34.060500817 +0100
-@@ -524,7 +524,11 @@
- uint dummy1, dummy2, dummy3;
-
- __asm__ __volatile__(
-+#ifdef __x86_64__
-+ "push %%rdx
\n"
-+#else
- "push %%edx
\n"
-+#endif
- "xor %%edx, %%edx
\n" // edx = 0, cf = 0
- "1:
\n"
- "mov (%%esi,%%edx,4), %%eax
\n"
-@@ -536,7 +540,11 @@
- "jnz 1b
\n"
-
- "adc %%ecx, %%ecx
\n" // ecx has the cf state
-+#ifdef __x86_64__
-+ "pop %%rax
\n" // eax = rest
-+#else
- "pop %%eax
\n" // eax = rest
-+#endif
-
- "or %%eax, %%eax
\n"
- "jz 3f
\n"
-@@ -857,7 +865,11 @@
- uint dummy1, dummy2, dummy3;
-
- __asm__ __volatile__(
-+#ifdef __x86_64__
-+ "push %%rdx
\n"
-+#else
- "push %%edx
\n"
-+#endif
- "xor %%edx, %%edx
\n" // edx = 0, cf = 0
- "1:
\n"
- "mov (%%esi,%%edx,4), %%eax
\n"
-@@ -869,7 +881,11 @@
- "jnz 1b
\n"
-
- "adc %%ecx, %%ecx
\n" // ecx has the cf state
-+#ifdef __x86_64__
-+ "pop %%rax
\n" // eax = rest
-+#else
- "pop %%eax
\n" // eax = rest
-+#endif
-
- "or %%eax, %%eax
\n"
- "jz 3f
\n"
-@@ -1141,7 +1157,11 @@
-
- __asm__ __volatile__(
-
-+#ifdef __x86_64__
-+ "push %%rbp
\n"
-+#else
- "push %%ebp
\n"
-+#endif
-
- "movl %%ecx, %%esi \n"
- "movl $32, %%ecx \n"
-@@ -1171,7 +1191,11 @@
-
- "and $1, %%eax \n"
-
-+#ifdef __x86_64__
-+ "pop %%rbp
\n"
-+#else
- "pop %%ebp
\n"
-+#endif
-
- : "=a" (c), "=D" (dummy), "=S" (dummy2), "=d" (dummy3)
- : "0" (c), "1" (b), "b" (p1), "c" (bits)
-@@ -1272,7 +1296,11 @@
-
- __asm__ __volatile__(
-
-+#ifdef __x86_64__
-+ "push %%rbp
\n"
-+#else
- "push %%ebp
\n"
-+#endif
-
- "movl %%ecx, %%esi \n"
- "movl $32, %%ecx \n"
-@@ -1305,7 +1333,11 @@
- "roll $1, %%eax \n"
- "andl $1, %%eax \n"
-
-+#ifdef __x86_64__
-+ "pop %%rbp
\n"
-+#else
- "pop %%ebp
\n"
-+#endif
-
- : "=a" (c), "=D" (dummy), "=S" (dummy2), "=d" (dummy3)
- : "0" (c), "1" (b), "b" (p1), "c" (bits)
diff --git a/rubydir.patch b/rubydir.patch
deleted file mode 100644
index 0992707..0000000
--- a/rubydir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- geos-3.8.1/macros/ruby.m4.orig 2019-09-18 23:38:19.000000000 +0200
-+++ geos-3.8.1/macros/ruby.m4 2020-11-08 15:38:19.929621492 +0100
-@@ -41,7 +41,7 @@
- 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"]]'`
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/geos.git/commitdiff/3f79e9310e7c051b763df5a924bdd75a7a94fc07
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
