Upstream update.
- Rebase patches. - Modernize spec.
This commit is contained in:
Ralf Corsépius
parent
e7e90e82cd
commit
de4f5e5841
5 changed files with 27 additions and 53 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -1 +1 @@
|
|||
ann_1.1.1.tar.gz
|
||||
/ann_1.1.2.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,30 +1,6 @@
|
|||
diff -Nru ann_1.1.1.orig/ann2fig/ann2fig.cpp ann_1.1.1/ann2fig/ann2fig.cpp
|
||||
--- ann_1.1.1.orig/ann2fig/ann2fig.cpp 2006-08-04 21:46:28.000000000 +0200
|
||||
+++ ann_1.1.1/ann2fig/ann2fig.cpp 2008-08-14 20:13:06.000000000 +0200
|
||||
@@ -41,6 +41,8 @@
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
#include <cstdio> // C standard I/O
|
||||
+#include <cstring> // C standard string
|
||||
+#include <cstdlib> // C standard lib
|
||||
#include <fstream> // file I/O
|
||||
#include <string> // string manipulation
|
||||
#include <ANN/ANNx.h> // all ANN includes
|
||||
diff -Nru ann_1.1.1.orig/src/ANN.cpp ann_1.1.1/src/ANN.cpp
|
||||
--- ann_1.1.1.orig/src/ANN.cpp 2006-08-04 21:46:27.000000000 +0200
|
||||
+++ ann_1.1.1/src/ANN.cpp 2008-08-14 20:13:06.000000000 +0200
|
||||
@@ -24,6 +24,8 @@
|
||||
// Added performance counting to annDist()
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
+#include <cstdlib> // C standard lib
|
||||
+
|
||||
#include <ANN/ANNx.h> // all ANN includes
|
||||
#include <ANN/ANNperf.h> // ANN performance
|
||||
|
||||
diff -Nru ann_1.1.1.orig/src/kd_dump.cpp ann_1.1.1/src/kd_dump.cpp
|
||||
--- ann_1.1.1.orig/src/kd_dump.cpp 2006-08-04 21:46:27.000000000 +0200
|
||||
+++ ann_1.1.1/src/kd_dump.cpp 2008-08-14 20:15:03.000000000 +0200
|
||||
diff -Naur ann_1.1.2.orig/src/kd_dump.cpp ann_1.1.2/src/kd_dump.cpp
|
||||
--- ann_1.1.2.orig/src/kd_dump.cpp 2010-01-28 05:40:01.000000000 +0100
|
||||
+++ ann_1.1.2/src/kd_dump.cpp 2013-03-22 15:59:40.675142146 +0100
|
||||
@@ -31,6 +31,9 @@
|
||||
// desired.)
|
||||
//----------------------------------------------------------------------
|
||||
|
|
@ -35,11 +11,11 @@ diff -Nru ann_1.1.1.orig/src/kd_dump.cpp ann_1.1.1/src/kd_dump.cpp
|
|||
#include "kd_tree.h" // kd-tree declarations
|
||||
#include "bd_tree.h" // bd-tree declarations
|
||||
|
||||
diff -Nru ann_1.1.1.orig/test/ann_test.cpp ann_1.1.1/test/ann_test.cpp
|
||||
--- ann_1.1.1.orig/test/ann_test.cpp 2006-08-04 21:46:27.000000000 +0200
|
||||
+++ ann_1.1.1/test/ann_test.cpp 2008-08-14 20:13:06.000000000 +0200
|
||||
@@ -34,6 +34,9 @@
|
||||
// Added planted distribution
|
||||
diff -Naur ann_1.1.2.orig/test/ann_test.cpp ann_1.1.2/test/ann_test.cpp
|
||||
--- ann_1.1.2.orig/test/ann_test.cpp 2010-01-28 05:40:01.000000000 +0100
|
||||
+++ ann_1.1.2/test/ann_test.cpp 2013-03-22 15:59:40.676142171 +0100
|
||||
@@ -37,6 +37,9 @@
|
||||
// Allow round-off error in validation test
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
+#include <cstring> // C standard string
|
||||
|
|
@ -47,4 +23,4 @@ diff -Nru ann_1.1.1.orig/test/ann_test.cpp ann_1.1.1/test/ann_test.cpp
|
|||
+
|
||||
#include <ctime> // clock
|
||||
#include <cmath> // math routines
|
||||
#include <string> // C string ops
|
||||
#include <cstring> // C string ops
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -Nru ann_1.1.1.orig/Make-config ann_1.1.1/Make-config
|
||||
--- ann_1.1.1.orig/Make-config 2006-08-04 21:46:26.000000000 +0200
|
||||
+++ ann_1.1.1/Make-config 2008-08-14 19:35:57.000000000 +0200
|
||||
diff -Naur ann_1.1.2.orig/Make-config ann_1.1.2/Make-config
|
||||
--- ann_1.1.2.orig/Make-config 2010-01-28 05:40:01.000000000 +0100
|
||||
+++ ann_1.1.2/Make-config 2013-03-22 15:56:58.290617102 +0100
|
||||
@@ -67,6 +67,14 @@
|
||||
# files in the MS_WIN32 directory).
|
||||
#-----------------------------------------------------------------------------
|
||||
|
|
@ -16,9 +16,9 @@ diff -Nru ann_1.1.1.orig/Make-config ann_1.1.1/Make-config
|
|||
# Linux using g++
|
||||
linux-g++:
|
||||
$(MAKE) targets \
|
||||
diff -Nru ann_1.1.1.orig/Makefile ann_1.1.1/Makefile
|
||||
--- ann_1.1.1.orig/Makefile 2006-08-04 21:46:26.000000000 +0200
|
||||
+++ ann_1.1.1/Makefile 2008-08-14 19:28:16.000000000 +0200
|
||||
diff -Naur ann_1.1.2.orig/Makefile ann_1.1.2/Makefile
|
||||
--- ann_1.1.2.orig/Makefile 2010-01-28 05:40:01.000000000 +0100
|
||||
+++ ann_1.1.2/Makefile 2013-03-22 15:56:58.290617102 +0100
|
||||
@@ -56,7 +56,7 @@
|
||||
#-----------------------------------------------------------------------------
|
||||
# main make entry point
|
||||
|
|
@ -28,9 +28,9 @@ diff -Nru ann_1.1.1.orig/Makefile ann_1.1.1/Makefile
|
|||
cd src ; $(MAKE) $@
|
||||
cd test ; $(MAKE) $@
|
||||
cd sample ; $(MAKE) $@
|
||||
diff -Nru ann_1.1.1.orig/src/Makefile ann_1.1.1/src/Makefile
|
||||
--- ann_1.1.1.orig/src/Makefile 2006-08-04 21:46:27.000000000 +0200
|
||||
+++ ann_1.1.1/src/Makefile 2008-08-14 19:36:45.000000000 +0200
|
||||
diff -Naur ann_1.1.2.orig/src/Makefile ann_1.1.2/src/Makefile
|
||||
--- ann_1.1.2.orig/src/Makefile 2010-01-28 05:40:01.000000000 +0100
|
||||
+++ ann_1.1.2/src/Makefile 2013-03-22 15:56:58.290617102 +0100
|
||||
@@ -56,7 +56,8 @@
|
||||
$(LIBDIR)/$(ANNLIB): $(OBJECTS)
|
||||
$(MAKELIB) $(ANNLIB) $(OBJECTS)
|
||||
|
|
|
|||
16
ann.spec
16
ann.spec
|
|
@ -1,6 +1,6 @@
|
|||
Name: ann
|
||||
Version: 1.1.1
|
||||
Release: 9%{?dist}
|
||||
Version: 1.1.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Library for searching Approximate Nearest Neighbors
|
||||
|
||||
Group: Applications/System
|
||||
|
|
@ -9,7 +9,6 @@ URL: http://www.cs.umd.edu/~mount/ANN
|
|||
Source0: http://www.cs.umd.edu/~mount/ANN/Files/%{version}/%{name}_%{version}.tar.gz
|
||||
Patch0: ann-make.patch
|
||||
Patch1: ann-gcc43.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
|
||||
%description
|
||||
|
|
@ -51,8 +50,6 @@ make %{?_smp_mflags} linux CFLAGS="-fPIC -DPIC $RPM_OPT_FLAGS"
|
|||
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_includedir}/ANN
|
||||
mkdir -p $RPM_BUILD_ROOT%{_libdir}
|
||||
mkdir -p $RPM_BUILD_ROOT%{_bindir}
|
||||
|
|
@ -67,10 +64,6 @@ ln -s libANN.so.1.0 libANN.so
|
|||
popd
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%post libs -p /sbin/ldconfig
|
||||
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
|
@ -93,6 +86,11 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Mar 22 2013 Ralf Corsépius <corsepiu@fedoraproject.org> - 1.1.2-1
|
||||
- Upstream update.
|
||||
- Rebase patches.
|
||||
- Modernize spec.
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
b6247e4a34e8a5e122ebf299cd51f871 ann_1.1.1.tar.gz
|
||||
7ffaacc7ea79ca39d4958a6378071365 ann_1.1.2.tar.gz
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue