[NearTree] Update to 3.1.
tmatsuu
tmatsuu at fedoraproject.org
Tue Jun 7 15:27:47 UTC 2011
commit 24ff0177d0c07e245f478d5829e6389391e61381
Author: Takanori MATSUURA <t.matsuu at gmail.com>
Date: Wed Jun 8 00:25:12 2011 +0900
Update to 3.1.
NearTree-2.4.tar.gz | Bin 106761 -> 0 bytes
...2.3.1-fedora.patch => NearTree-3.1-fedora.patch | 12 ++++--------
...e-2.3.2-lib64.patch => NearTree-3.1-lib64.patch | 20 ++++++++++----------
NearTree-3.1.tar.gz | Bin 0 -> 141820 bytes
NearTree.spec | 11 +++++++----
5 files changed, 21 insertions(+), 22 deletions(-)
---
diff --git a/NearTree-2.3.1-fedora.patch b/NearTree-3.1-fedora.patch
similarity index 50%
rename from NearTree-2.3.1-fedora.patch
rename to NearTree-3.1-fedora.patch
index 6abb4a2..5e5d198 100644
--- a/NearTree-2.3.1-fedora.patch
+++ b/NearTree-3.1-fedora.patch
@@ -1,11 +1,7 @@
---- NearTree-2.3.1/Makefile.fedora 2010-09-08 06:59:46.000000000 +0900
-+++ NearTree-2.3.1/Makefile 2010-10-12 22:08:27.147897560 +0900
-@@ -112,10 +112,10 @@
-
- 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) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/lib
-+LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -no-undefined -rpath $(INSTALL_PREFIX)/lib
+--- NearTree-3.1/Makefile.fedora 2011-04-24 10:22:51.000000000 +0900
++++ NearTree-3.1/Makefile 2011-06-07 23:59:27.160033393 +0900
+@@ -119,7 +119,7 @@
+ LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -no-undefined -rpath $(INSTALL_PREFIX)/lib
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) -shared -I$(INSTALL_PREFIX)/include
diff --git a/NearTree-2.3.2-lib64.patch b/NearTree-3.1-lib64.patch
similarity index 83%
rename from NearTree-2.3.2-lib64.patch
rename to NearTree-3.1-lib64.patch
index 577133a..cd4d1c5 100644
--- a/NearTree-2.3.2-lib64.patch
+++ b/NearTree-3.1-lib64.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- NearTree-3.1/Makefile.lib64 2011-06-08 00:16:49.906634585 +0900
++++ NearTree-3.1/Makefile 2011-06-08 00:17:35.136102740 +0900
+@@ -83,7 +83,7 @@
# Directories
#
ROOT = .
@@ -9,18 +9,18 @@
BIN = $(ROOT)/bin
SRC = $(ROOT)
INC = $(ROOT)
-@@ -114,7 +114,7 @@
+@@ -116,7 +116,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
+-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 @@
+@@ -225,11 +225,11 @@
$(LIB)/libCNearTree.$(LIB_EXT) \
- $(BIN)/CPPMain $(BIN)/CMain $(BIN)/CPPNearTreeTest $(BIN)/CNearTreeTest
+ $(BIN)/CPPMain $(BIN)/CMain $(BIN)/CPPNearTreeTest $(BIN)/CNearTreeTest $(BIN)/CNearTreeTestInst
-install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include \
+install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib64 $(INSTALL_PREFIX)/include \
@@ -33,7 +33,7 @@
-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 @@
+@@ -242,11 +242,11 @@
chmod 644 $(INSTALL_PREFIX)/include/triple.h
echo "Testing final install dynamic"
$(BUILD_COMMAND_DYNAMIC) $(INCLUDES) $(EXAMPLES)/CNearTreeTest.c \
@@ -47,7 +47,7 @@
$(BIN)/CNearTreeTest_static
-@@ -255,8 +255,8 @@
+@@ -257,8 +257,8 @@
$(INSTALL_PREFIX):
mkdir -p $(INSTALL_PREFIX)
diff --git a/NearTree-3.1.tar.gz b/NearTree-3.1.tar.gz
new file mode 100644
index 0000000..0b2d790
Binary files /dev/null and b/NearTree-3.1.tar.gz differ
diff --git a/NearTree.spec b/NearTree.spec
index 2e3efbf..b620031 100644
--- a/NearTree.spec
+++ b/NearTree.spec
@@ -1,6 +1,6 @@
Name: NearTree
-Version: 2.4
-Release: 2%{?dist}
+Version: 3.1
+Release: 1%{?dist}
Summary: An API for finding nearest neighbors
Group: System Environment/Libraries
@@ -9,9 +9,9 @@ URL: http://neartree.sourceforge.net/
Source0: http://downloads.sourceforge.net/project/neartree/neartree/NearTree-%{version}/NearTree-%{version}.tar.gz
# library should not have version number in their name.
# Sent to upstream but upstream cannot accept.
-Patch0: NearTree-2.3.1-fedora.patch
+Patch0: NearTree-3.1-fedora.patch
# to fix libdir for lib64 architecture
-Patch1: NearTree-2.3.2-lib64.patch
+Patch1: NearTree-3.1-lib64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool CVector-devel
@@ -82,6 +82,9 @@ rm -rf %{buildroot}
%{_libdir}/libCNearTree.so
%changelog
+* Wed Jun 8 2011 Takanori MATSUURA <t.matsuu at gmail.com> - 3.1-1
+- update to 3.1
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list