From 620278fd3a8e9674e2594d05e888640cde6e2b0d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:48:52 +0000 Subject: [PATCH 01/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ann.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ann.spec b/ann.spec index a128935..0a72c91 100644 --- a/ann.spec +++ b/ann.spec @@ -1,6 +1,6 @@ Name: ann Version: 1.1.2 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Library for searching Approximate Nearest Neighbors License: LGPLv2+ @@ -94,6 +94,9 @@ EOF %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.1.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 1.1.2-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 9d13e61eef08d61a7485bc6afd8ef7095053eb49 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:45:01 +0000 Subject: [PATCH 02/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ann.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ann.spec b/ann.spec index 0a72c91..8157fdb 100644 --- a/ann.spec +++ b/ann.spec @@ -1,6 +1,6 @@ Name: ann Version: 1.1.2 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Library for searching Approximate Nearest Neighbors License: LGPLv2+ @@ -94,6 +94,9 @@ EOF %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.1.2-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 1.1.2-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From b1ca6c941898e42cd8652d120cb34fc8f1d5ab9f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:17:33 +0000 Subject: [PATCH 03/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ann.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ann.spec b/ann.spec index 8157fdb..ff220a5 100644 --- a/ann.spec +++ b/ann.spec @@ -1,6 +1,6 @@ Name: ann Version: 1.1.2 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Library for searching Approximate Nearest Neighbors License: LGPLv2+ @@ -94,6 +94,9 @@ EOF %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.1.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 1.1.2-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 624b0c8f6b8bef7b1d823b7a034c1cb52ebd41aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:57:09 +0000 Subject: [PATCH 04/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ann.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ann.spec b/ann.spec index ff220a5..f7e0d97 100644 --- a/ann.spec +++ b/ann.spec @@ -1,6 +1,6 @@ Name: ann Version: 1.1.2 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Library for searching Approximate Nearest Neighbors License: LGPLv2+ @@ -94,6 +94,9 @@ EOF %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.1.2-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1.1.2-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From d3d360cec06d24e36ba8c10f85fa31ccb3c6502b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:03:30 +0000 Subject: [PATCH 05/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ann.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ann.spec b/ann.spec index f7e0d97..b3633ce 100644 --- a/ann.spec +++ b/ann.spec @@ -1,6 +1,6 @@ Name: ann Version: 1.1.2 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Library for searching Approximate Nearest Neighbors License: LGPLv2+ @@ -94,6 +94,9 @@ EOF %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.1.2-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.1.2-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a9742827b8aeb4c6a2d8751f1b18954751b57e4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 6 May 2024 17:49:06 +0200 Subject: [PATCH 06/10] - modernize spec --- ann-make.patch | 14 +++++++++++++- ann.spec | 33 +++++++++++++++++---------------- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/ann-make.patch b/ann-make.patch index 1788df4..ead61ec 100644 --- a/ann-make.patch +++ b/ann-make.patch @@ -11,7 +11,7 @@ diff -Naur ann_1.1.2.orig/Make-config ann_1.1.2/Make-config + "ANNLIB = libANN.so.1.0" \ + "ANNDEVLIB = libANN.so" \ + "C++ = g++" \ -+ "MAKELIB = g++ -shared -Wl,-soname -Wl,libANN.so.1 -o" \ ++ "MAKELIB = g++ -shared -Wl,-soname -Wl,libANN.so.1 $(LDFLAGS) -o" \ + "RANLIB = true" # Linux using g++ linux-g++: @@ -41,3 +41,15 @@ diff -Naur ann_1.1.2.orig/src/Makefile ann_1.1.2/src/Makefile #----------------------------------------------------------------------------- # Make object files +diff -up ann_1.1.2/ann2fig/Makefile.orig ann_1.1.2/ann2fig/Makefile +--- ann_1.1.2/ann2fig/Makefile.orig 2024-05-06 17:35:19.240994566 +0200 ++++ ann_1.1.2/ann2fig/Makefile 2024-05-06 17:35:29.889681910 +0200 +@@ -75,7 +75,7 @@ include ../Make-config + #----------------------------------------------------------------------------- + + ann2fig.o: ann2fig.cpp +- $(C++) -c -I$(INCDIR) ann2fig.cpp ++ $(C++) -c -I$(INCDIR) $(CFLAGS) ann2fig.cpp + + #----------------------------------------------------------------------------- + # Cleaning diff --git a/ann.spec b/ann.spec index b3633ce..833a6b5 100644 --- a/ann.spec +++ b/ann.spec @@ -1,15 +1,15 @@ Name: ann Version: 1.1.2 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Library for searching Approximate Nearest Neighbors -License: LGPLv2+ +License: LGPL-2.1-or-later 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 BuildRequires: gcc-c++ -BuildRequires: make +BuildRequires: make %description @@ -39,32 +39,30 @@ Development files needed to use ANN library. %prep -%setup -q -n %{name}_%{version} -%patch0 -p1 -b .make -%patch1 -p1 -b .gcc43 +%autosetup -n %{name}_%{version} -p1 %build -%make_build linux CFLAGS="-fPIC -DPIC $RPM_OPT_FLAGS" +%make_build linux CFLAGS="-fPIC -DPIC %{build_cxxflags}" LDFLAGS="%{build_ldflags} -L../lib" %install -mkdir -p $RPM_BUILD_ROOT%{_includedir}/ANN -mkdir -p $RPM_BUILD_ROOT%{_libdir} -mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig -mkdir -p $RPM_BUILD_ROOT%{_bindir} +mkdir -p %{buildroot}%{_includedir}/ANN +mkdir -p %{buildroot}%{_libdir} +mkdir -p %{buildroot}%{_libdir}/pkgconfig +mkdir -p %{buildroot}%{_bindir} -install -p -m 0644 include/ANN/*.h $RPM_BUILD_ROOT%{_includedir}/ANN -install -p -m 0755 lib/libANN.so.* $RPM_BUILD_ROOT%{_libdir} -install -p -m 0755 bin/ann2fig $RPM_BUILD_ROOT%{_bindir} +install -p -m 0644 include/ANN/*.h %{buildroot}%{_includedir}/ANN +install -p -m 0755 lib/libANN.so.* %{buildroot}%{_libdir} +install -p -m 0755 bin/ann2fig %{buildroot}%{_bindir} -pushd $RPM_BUILD_ROOT%{_libdir} +pushd %{buildroot}%{_libdir} ln -s libANN.so.1.0 libANN.so.1 ln -s libANN.so.1.0 libANN.so popd # create pkg-config file -cat << EOF > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc +cat << EOF > %{buildroot}%{_libdir}/pkgconfig/%{name}.pc prefix=%{_prefix} exec_prefix=%{_exec_prefix} libdir=%{_libdir} @@ -94,6 +92,9 @@ EOF %changelog +* Mon May 06 2024 Dan Horák - 1.1.2-28 +- modernize spec + * Mon Jan 22 2024 Fedora Release Engineering - 1.1.2-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 98afadf50bbeb6ddf40094c4955b62ddd15b652f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:00:14 +0000 Subject: [PATCH 07/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ann.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ann.spec b/ann.spec index 833a6b5..d52185a 100644 --- a/ann.spec +++ b/ann.spec @@ -1,6 +1,6 @@ Name: ann Version: 1.1.2 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Library for searching Approximate Nearest Neighbors License: LGPL-2.1-or-later @@ -92,6 +92,9 @@ EOF %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.1.2-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon May 06 2024 Dan Horák - 1.1.2-28 - modernize spec From d40fb9339523d004f4954d7366b0db3bd693c178 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:03:17 +0000 Subject: [PATCH 08/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ann.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ann.spec b/ann.spec index d52185a..ddc1f68 100644 --- a/ann.spec +++ b/ann.spec @@ -1,6 +1,6 @@ Name: ann Version: 1.1.2 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Library for searching Approximate Nearest Neighbors License: LGPL-2.1-or-later @@ -92,6 +92,9 @@ EOF %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.1.2-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 1.1.2-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 94f0b4d2df334a455ab22ebefd7b56a54ea21b21 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:59:23 +0000 Subject: [PATCH 09/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ann.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ann.spec b/ann.spec index ddc1f68..9b5f14e 100644 --- a/ann.spec +++ b/ann.spec @@ -1,6 +1,6 @@ Name: ann Version: 1.1.2 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Library for searching Approximate Nearest Neighbors License: LGPL-2.1-or-later @@ -92,6 +92,9 @@ EOF %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.1.2-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 1.1.2-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 312afe1b852b9fa91878bc4ee970480592b02553 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:40:56 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- ann.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ann.spec b/ann.spec index 9b5f14e..9aae004 100644 --- a/ann.spec +++ b/ann.spec @@ -1,6 +1,6 @@ Name: ann Version: 1.1.2 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Library for searching Approximate Nearest Neighbors License: LGPL-2.1-or-later @@ -92,6 +92,9 @@ EOF %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.1.2-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 1.1.2-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild