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 $(LDFLAGS) -o" \
++	"MAKELIB = g++ -shared -Wl,-soname -Wl,libANN.so.1 -o" \
 +	"RANLIB = true"
  #					Linux using g++
  linux-g++:
@@ -41,15 +41,3 @@ 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

ann.spec

@@ -1,15 +1,14 @@
 Name:           ann
 Version:        1.1.2
-Release:        32%{?dist}
+Release:        14%{?dist}
 Summary:        Library for searching Approximate Nearest Neighbors
 
-License:        LGPL-2.1-or-later
+License:        LGPLv2+
 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
 
 
 %description
@@ -39,30 +38,32 @@ Development files needed to use ANN library.
 
 
 %prep
-%autosetup -n %{name}_%{version} -p1
+%setup -q -n %{name}_%{version}
+%patch0 -p1 -b .make
+%patch1 -p1 -b .gcc43
 
 
 %build
-%make_build linux CFLAGS="-fPIC -DPIC %{build_cxxflags}" LDFLAGS="%{build_ldflags} -L../lib"
+make %{?_smp_mflags} linux CFLAGS="-fPIC -DPIC $RPM_OPT_FLAGS"
 
 
 %install
-mkdir -p %{buildroot}%{_includedir}/ANN
-mkdir -p %{buildroot}%{_libdir}
-mkdir -p %{buildroot}%{_libdir}/pkgconfig
-mkdir -p %{buildroot}%{_bindir}
+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}
 
-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}
+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}
 
-pushd %{buildroot}%{_libdir}
+pushd $RPM_BUILD_ROOT%{_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 > %{buildroot}%{_libdir}/pkgconfig/%{name}.pc
+cat << EOF > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 prefix=%{_prefix}
 exec_prefix=%{_exec_prefix}
 libdir=%{_libdir}
@@ -92,62 +93,6 @@ EOF
 
 
 %changelog
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon May 06 2024 Dan Horák <dan[at]danny.cz> - 1.1.2-28
-- modernize spec
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-19
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 22 2020 Tom Stellard <tstellar@redhat.com> - 1.1.2-17
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild