[geos] Update to 3.2.2 Add a patch to build on ARM.
Devrim GÜNDÜZ
devrim at fedoraproject.org
Mon May 9 19:55:20 UTC 2011
commit e1282c6368ddc85d03cb30f19f08a8c675ed53bf
Author: Devrim GÜNDÜZ <devrim at gunduz.org>
Date: Mon May 9 22:54:27 2011 +0300
Update to 3.2.2
Add a patch to build on ARM.
.gitignore | 2 +-
geos-3.2.0-ARM.patch | 13 +++++++++++++
geos.spec | 10 ++++++++--
sources | 2 +-
4 files changed, 23 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f93f8df..86adbb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-geos-3.2.1.tar.bz2
+geos-3.2.2.tar.bz2
diff --git a/geos-3.2.0-ARM.patch b/geos-3.2.0-ARM.patch
new file mode 100644
index 0000000..f564099
--- /dev/null
+++ b/geos-3.2.0-ARM.patch
@@ -0,0 +1,13 @@
+--- source/inlines.cpp.orig 2009-12-29 21:08:46.400000000 +0100
++++ source/inlines.cpp 2009-12-29 21:22:16.820000000 +0100
+@@ -59,7 +59,10 @@
+ #include <geos/geom/CoordinateArraySequenceFactory.inl>
+ #include <geos/noding/SegmentString.inl>
+ #include <geos/noding/snapround/HotPixel.inl>
++// see http://trac.osgeo.org/geos/ticket/222
++#if ! defined(__ARM_EABI__)
+ #include <geos/noding/snapround/MCIndexSnapRounder.inl>
++#endif // !defined __ARM_EABI__
+ #include <geos/noding/MCIndexNoder.inl>
+
+ #endif // defined __CYGWIN__
diff --git a/geos.spec b/geos.spec
index e7e6762..cd2600f 100644
--- a/geos.spec
+++ b/geos.spec
@@ -1,6 +1,6 @@
Name: geos
-Version: 3.2.1
-Release: 4%{?dist}
+Version: 3.2.2
+Release: 1%{?dist}
Summary: GEOS is a C++ port of the Java Topology Suite
Group: Applications/Engineering
@@ -10,6 +10,7 @@ Source0: http://download.osgeo.org/%{name}/%{name}-%{version}.tar.bz2
Patch0: geos-gcc43.patch
# fixed in upstream revision 3000
Patch1: geos-3.2.1-swig.patch
+Patch2: geos-3.2.0-ARM.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen libtool
%if "%{?dist}" != ".el4"
@@ -64,6 +65,7 @@ Ruby module to build applications using GEOS and ruby
%setup -q
%patch0 -p0 -b .gcc43
%patch1 -p1 -b .swig
+%patch2 -p0
%build
@@ -141,6 +143,10 @@ rm -rf %{buildroot}
%endif
%changelog
+* Mon May 9 2011 Devrim GUNDUZ <devrim at gunduz.org> - 3.2.2-1
+- Update to 3.2.2
+- Add a patch to fix builds on ARM, per bz #682538
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 25aff9d..8aae5e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-01f01943bdf598977cee40905c9abfbf geos-3.2.1.tar.bz2
+c5d264acac22fe7720f85dadc1fc17c6 geos-3.2.2.tar.bz2
More information about the scm-commits
mailing list