[NearTree] Update to 2.3.2.
tmatsuu
tmatsuu at fedoraproject.org
Wed Nov 10 16:16:24 UTC 2010
commit e729dcddf5f1f689093e7b9dda9f18bef6c165c2
Author: Takanori MATSUURA <t.matsuu at gmail.com>
Date: Wed Nov 10 22:37:22 2010 +0900
Update to 2.3.2.
NearTree-2.3.2-lib64.patch | 60 ++++++++++++++++++++++++++++++++++++++++++++
NearTree-2.3.2.tar.gz | Bin 0 -> 99412 bytes
NearTree.spec | 8 ++++-
3 files changed, 66 insertions(+), 2 deletions(-)
---
diff --git a/NearTree-2.3.2-lib64.patch b/NearTree-2.3.2-lib64.patch
new file mode 100644
index 0000000..577133a
--- /dev/null
+++ b/NearTree-2.3.2-lib64.patch
@@ -0,0 +1,60 @@
+--- NearTree-2.3.2/Makefile.lib64 2010-11-10 22:24:28.710039911 +0900
++++ NearTree-2.3.2/Makefile 2010-11-10 22:27:25.063641730 +0900
+@@ -81,7 +81,7 @@
+ # Directories
+ #
+ ROOT = .
+-LIB = $(ROOT)/lib
++LIB = $(ROOT)/lib64
+ BIN = $(ROOT)/bin
+ SRC = $(ROOT)
+ INC = $(ROOT)
+@@ -114,7 +114,7 @@
+
+ COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
+ CPPCOMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
+-LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -no-undefined -rpath $(INSTALL_PREFIX)/lib
++LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -no-undefined -rpath $(INSTALL_PREFIX)/lib64
+ BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
+ CPPBUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CXX) -no-undefined $(CFLAGS) $(INCLUDES)
+ BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) -rdynamic -I$(INSTALL_PREFIX)/include
+@@ -223,11 +223,11 @@
+ $(LIB)/libCNearTree.$(LIB_EXT) \
+ $(BIN)/CPPMain $(BIN)/CMain $(BIN)/CPPNearTreeTest $(BIN)/CNearTreeTest
+
+-install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include \
++install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib64 $(INSTALL_PREFIX)/include \
+ $(INC) $(LIB)/libCNearTree.$(LIB_EXT) $(INC)/TNear.h $(INC)/CNearTree.h \
+ $(INC)/rhrand.h $(INC)/triple.h
+- $(INSTALL_COMMAND) $(LIB)/libCNearTree.$(LIB_EXT) $(INSTALL_PREFIX)/lib/libCNearTree.$(LIB_EXT)
+- $(INSTALL_FINISH_COMMAND) $(INSTALL_PREFIX)/lib/libCNearTree.$(LIB_EXT)
++ $(INSTALL_COMMAND) $(LIB)/libCNearTree.$(LIB_EXT) $(INSTALL_PREFIX)/lib64/libCNearTree.$(LIB_EXT)
++ $(INSTALL_FINISH_COMMAND) $(INSTALL_PREFIX)/lib64/libCNearTree.$(LIB_EXT)
+ -cp $(INSTALL_PREFIX)/include/TNear.h $(INSTALL_PREFIX)/include/TNear_old.h
+ -cp $(INSTALL_PREFIX)/include/CNearTree.h $(INSTALL_PREFIX)/include/CNearTree_old.h
+ cp $(INC)/TNear.h $(INSTALL_PREFIX)/include/TNear.h
+@@ -240,11 +240,11 @@
+ chmod 644 $(INSTALL_PREFIX)/include/triple.h
+ echo "Testing final install dynamic"
+ $(BUILD_COMMAND_DYNAMIC) $(INCLUDES) $(EXAMPLES)/CNearTreeTest.c \
+- -L$(INSTALL_PREFIX)/lib -lCNearTree $(CLIBRARIES) -o $(BIN)/CNearTreeTest_dynamic
++ -L$(INSTALL_PREFIX)/lib64 -lCNearTree $(CLIBRARIES) -o $(BIN)/CNearTreeTest_dynamic
+ $(BIN)/CNearTreeTest_dynamic
+ echo "Testing final install static"
+ $(BUILD_COMMAND_STATIC) $(INCLUDES) $(EXAMPLES)/CNearTreeTest.c \
+- -L$(INSTALL_PREFIX)/lib -lCNearTree $(CLIBRARIES) -o $(BIN)/CNearTreeTest_static
++ -L$(INSTALL_PREFIX)/lib64 -lCNearTree $(CLIBRARIES) -o $(BIN)/CNearTreeTest_static
+ $(BIN)/CNearTreeTest_static
+
+
+@@ -255,8 +255,8 @@
+ $(INSTALL_PREFIX):
+ mkdir -p $(INSTALL_PREFIX)
+
+-$(INSTALL_PREFIX)/lib: $(INSTALL_PREFIX)
+- mkdir -p $(INSTALL_PREFIX)/lib
++$(INSTALL_PREFIX)/lib64: $(INSTALL_PREFIX)
++ mkdir -p $(INSTALL_PREFIX)/lib64
+
+ $(INSTALL_PREFIX)/bin: $(INSTALL_PREFIX)
+ mkdir -p $(INSTALL_PREFIX)/bin
diff --git a/NearTree-2.3.2.tar.gz b/NearTree-2.3.2.tar.gz
new file mode 100644
index 0000000..fd7195c
Binary files /dev/null and b/NearTree-2.3.2.tar.gz differ
diff --git a/NearTree.spec b/NearTree.spec
index 24e5e70..1523cf6 100644
--- a/NearTree.spec
+++ b/NearTree.spec
@@ -1,5 +1,5 @@
Name: NearTree
-Version: 2.3.1
+Version: 2.3.2
Release: 1%{?dist}
Summary: An API for finding nearest neighbors
@@ -11,7 +11,7 @@ Source0: http://downloads.sourceforge.net/project/neartree/neartree/NearT
# Sent to upstream but upstream cannot accept.
Patch0: NearTree-2.3.1-fedora.patch
# to fix libdir for lib64 architecture
-Patch1: NearTree-2.3.1-lib64.patch
+Patch1: NearTree-2.3.2-lib64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool CVector-devel
@@ -73,10 +73,14 @@ rm -rf %{buildroot}
%{_includedir}/CNearTree.h
%{_includedir}/TNear.h
%{_includedir}/rhrand.h
+%{_includedir}/triple.h
%{_libdir}/libCNearTree.so
%changelog
+* Thu Nov 11 2010 Takanori MATSUURA <t.matsuu at gmail.com> - 2.3.2-1
+- update to 2.3.2
+
* Fri Oct 22 2010 Takanori MATSUURA <t.matsuu at gmail.com> - 2.3.1-1
- initial import (#545047)
More information about the scm-commits
mailing list