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 0a72c91..9aae004 100644 --- a/ann.spec +++ b/ann.spec @@ -1,15 +1,15 @@ Name: ann Version: 1.1.2 -Release: 23%{?dist} +Release: 32%{?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,33 @@ 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 + +* 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 + +* 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 + +* 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 + +* 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