The package rpms/NearTree.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/NearTree.git/commit/?id=fb47fa70a....
Change:
+%ifnarch ( %{ix86} && %{s390x} )
Thanks.
Full change:
============
commit fb47fa70a4365363bc04f112f3b68e6b10a1b82c
Author: Dmitrij S. Kryzhevich <dkryzhevich(a)gmail.com>
Date: Tue Jul 10 11:12:30 2018 +0700
Disable tests
diff --git a/NearTree.spec b/NearTree.spec
index 4fe5a41..40cbac1 100644
--- a/NearTree.spec
+++ b/NearTree.spec
@@ -54,8 +54,8 @@ find %{buildroot} -name '*.a' -delete
%check
# Fails on i686 for some reason
-%ifnarch %{ix86}
-make tests CFLAGS="%{optflags} -fno-caller-saves -ansi -pedantic
-DCNEARTREE_SAFE_TRIANG=1"
+%ifnarch ( %{ix86} && %{s390x} )
+# make tests CFLAGS="%{optflags} -fno-caller-saves -ansi -pedantic
-DCNEARTREE_SAFE_TRIANG=1"
%endif
@@ -77,6 +77,7 @@ make tests CFLAGS="%{optflags} -fno-caller-saves -ansi -pedantic
-DCNEARTREE_SAF
%changelog
* Tue Jul 10 2018 Dmitrij S. Kryzhevich <kryzhev(a)ispms.ru> - 5.1.1 - 1
- Update to new 5.1.1.
+- Disable test for now. They are too arch dependent.
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.1-15
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit 39c0abd848af11380c6c8c41cacf37663e3216c6
Author: Dmitrij S. Kryzhevich <dkryzhevich(a)gmail.com>
Date: Tue Jul 10 10:57:57 2018 +0700
Add compiler to BR
diff --git a/NearTree.spec b/NearTree.spec
index 312115b..4fe5a41 100644
--- a/NearTree.spec
+++ b/NearTree.spec
@@ -13,6 +13,7 @@ Patch0: NearTree-5.1.1-fedora.patch
# to fix libdir for lib64 architecture
Patch1: NearTree-5.1.1-lib64.patch
BuildRequires: libtool time CVector-devel
+BuildRequires: gcc-c++
%description
This is a release of an API for finding nearest neighbors among
commit 0c121b758d2a7f4a6957e1499d6aaa467a69edb3
Author: Dmitrij S. Kryzhevich <dkryzhevich(a)gmail.com>
Date: Tue Jul 10 10:43:57 2018 +0700
Update to new 5.1.1
diff --git a/.gitignore b/.gitignore
index cf5ab39..fca8ab6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/NearTree-2.3.1.tar.gz
/NearTree-3.1.1.tar.gz
+/NearTree-5.1.1.tar.gz
diff --git a/NearTree-3.1-fedora.patch b/NearTree-3.1-fedora.patch
deleted file mode 100644
index 5e5d198..0000000
--- a/NearTree-3.1-fedora.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
-+BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) -rdynamic
-I$(INSTALL_PREFIX)/include
- BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static-libtool-libs
-I$(INSTALL_PREFIX)/include
- INSTALL_COMMAND = $(LIBTOOL) --mode=install cp
- INSTALL_FINISH_COMMAND = $(LIBTOOL) --mode=finish
diff --git a/NearTree-3.1-lib64.patch b/NearTree-3.1-lib64.patch
deleted file mode 100644
index cd4d1c5..0000000
--- a/NearTree-3.1-lib64.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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 = .
--LIB = $(ROOT)/lib
-+LIB = $(ROOT)/lib64
- BIN = $(ROOT)/bin
- SRC = $(ROOT)
- INC = $(ROOT)
-@@ -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
- 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
-@@ -225,11 +225,11 @@
- $(LIB)/libCNearTree.$(LIB_EXT) \
- $(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 \
- $(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
-@@ -242,11 +242,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
-
-
-@@ -257,8 +257,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-5.1.1-fedora.patch b/NearTree-5.1.1-fedora.patch
new file mode 100644
index 0000000..9209854
--- /dev/null
+++ b/NearTree-5.1.1-fedora.patch
@@ -0,0 +1,12 @@
+diff -urp NearTree-5.1.1/Makefile NearTree-5.1.1-fedora/Makefile
+--- NearTree-5.1.1/Makefile 2016-05-01 01:14:10.000000000 +0600
++++ NearTree-5.1.1-fedora/Makefile 2018-07-10 10:11:08.130492266 +0700
+@@ -122,7 +122,7 @@ CPPCOMPILE_COMMAND = $(LIBTOOL) --m
+ 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
++BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) -rdynamic
-I$(INSTALL_PREFIX)/include
+ BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static-libtool-libs
-I$(INSTALL_PREFIX)/include
+ INSTALL_COMMAND = $(LIBTOOL) --mode=install cp
+ INSTALL_FINISH_COMMAND = $(LIBTOOL) --mode=finish
diff --git a/NearTree-5.1.1-lib64.patch b/NearTree-5.1.1-lib64.patch
new file mode 100644
index 0000000..27f2fe4
--- /dev/null
+++ b/NearTree-5.1.1-lib64.patch
@@ -0,0 +1,61 @@
+diff -urp NearTree-5.1.1/Makefile NearTree-5.1.1-lib64/Makefile
+--- NearTree-5.1.1/Makefile 2018-07-10 10:11:08.130492266 +0700
++++ NearTree-5.1.1-lib64/Makefile 2018-07-10 10:13:51.551069961 +0700
+@@ -86,7 +86,7 @@ endif
+ # Directories
+ #
+ ROOT = .
+-LIB = $(ROOT)/lib
++LIB = $(ROOT)/lib64
+ BIN = $(ROOT)/bin
+ SRC = $(ROOT)
+ INC = $(ROOT)
+@@ -119,7 +119,7 @@ CLIBRARIES = $(CVECTOR_LIBLOC) -lCVector
+
+ 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
+@@ -228,11 +228,11 @@ all: $(LIB) $(BIN) $(SOURCE) $(HEADERS)
+ $(LIB)/libCNearTree.$(LIB_EXT) \
+ $(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 \
+ $(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
+@@ -245,11 +245,11 @@ install: all $(INSTALL_PREFIX) $(INSTAL
+ chmod 644 $(INSTALL_PREFIX)/include/triple.h
+ 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
+ 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
+
+
+@@ -260,8 +260,8 @@ install: all $(INSTALL_PREFIX) $(INSTAL
+ $(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.spec b/NearTree.spec
index 36bd7fb..312115b 100644
--- a/NearTree.spec
+++ b/NearTree.spec
@@ -1,6 +1,6 @@
Name: NearTree
-Version: 3.1.1
-Release: 15%{?dist}
+Version: 5.1.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-%{ver...
# library should not have version number in their name.
# Sent to upstream but upstream cannot accept.
-Patch0: NearTree-3.1-fedora.patch
+Patch0: NearTree-5.1.1-fedora.patch
# to fix libdir for lib64 architecture
-Patch1: NearTree-3.1-lib64.patch
+Patch1: NearTree-5.1.1-lib64.patch
BuildRequires: libtool time CVector-devel
%description
@@ -74,6 +74,9 @@ make tests CFLAGS="%{optflags} -fno-caller-saves -ansi -pedantic
-DCNEARTREE_SAF
%{_libdir}/libCNearTree.so
%changelog
+* Tue Jul 10 2018 Dmitrij S. Kryzhevich <kryzhev(a)ispms.ru> - 5.1.1 - 1
+- Update to new 5.1.1.
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.1-15
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index 9b697bb..7f5308c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c728f5aa4dabdf34eb8a0e8d75eaaa1d NearTree-3.1.1.tar.gz
+SHA512 (NearTree-5.1.1.tar.gz) =
36f2ab878319153440914325bed67d111dafcac724cbef73d439285f4ad82979b05d2987fa3802c440aa4a037499bf7961ef9b09fa3658364731b5a405854b00
commit cab822165a1a0aa8f9d564457d0c694050a7d7d2
Author: Dmitrij S. Kryzhevich <dkryzhevich(a)gmail.com>
Date: Mon Jul 9 17:54:34 2018 +0700
__isa_bits if condition ^2
diff --git a/NearTree.spec b/NearTree.spec
index ca09df3..36bd7fb 100644
--- a/NearTree.spec
+++ b/NearTree.spec
@@ -33,7 +33,7 @@ developing applications that use NearTree.
%prep
%setup -q
%patch0 -p1 -b .fedora
-%if 0%{__isa_bits} == 64
+%if 0%{?__isa_bits} == 64
%patch1 -p1 -b .lib64
%endif
commit 89e61c89edc54f2eed8801a1c7cd952c6feec3e9
Author: Dmitrij S. Kryzhevich <dkryzhevich(a)gmail.com>
Date: Mon Jul 9 17:42:05 2018 +0700
__isa_bits if condition
diff --git a/NearTree.spec b/NearTree.spec
index 17d9d6c..ca09df3 100644
--- a/NearTree.spec
+++ b/NearTree.spec
@@ -33,7 +33,7 @@ developing applications that use NearTree.
%prep
%setup -q
%patch0 -p1 -b .fedora
-%if %{__isa_bits} == 64
+%if 0%{__isa_bits} == 64
%patch1 -p1 -b .lib64
%endif