Compare commits

..

10 commits

Author SHA1 Message Date
Fedora Release Engineering
312afe1b85 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-16 03:40:56 +00:00
Fedora Release Engineering
94f0b4d2df Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 16:59:23 +00:00
Fedora Release Engineering
d40fb93395 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 11:03:17 +00:00
Fedora Release Engineering
98afadf50b Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 17:00:14 +00:00
Dan Horák
a9742827b8 - modernize spec 2024-05-06 18:03:42 +02:00
Fedora Release Engineering
d3d360cec0 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-22 23:03:30 +00:00
Fedora Release Engineering
624b0c8f6b Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 12:57:09 +00:00
Fedora Release Engineering
b1ca6c9418 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 13:17:33 +00:00
Fedora Release Engineering
9d13e61eef Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-18 21:45:01 +00:00
Fedora Release Engineering
620278fd3a Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-20 20:48:52 +00:00
2 changed files with 57 additions and 17 deletions

View file

@ -11,7 +11,7 @@ diff -Naur ann_1.1.2.orig/Make-config ann_1.1.2/Make-config
+ "ANNLIB = libANN.so.1.0" \ + "ANNLIB = libANN.so.1.0" \
+ "ANNDEVLIB = libANN.so" \ + "ANNDEVLIB = libANN.so" \
+ "C++ = g++" \ + "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" + "RANLIB = true"
# Linux using g++ # Linux using g++
linux-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 # 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

View file

@ -1,15 +1,15 @@
Name: ann Name: ann
Version: 1.1.2 Version: 1.1.2
Release: 22%{?dist} Release: 32%{?dist}
Summary: Library for searching Approximate Nearest Neighbors Summary: Library for searching Approximate Nearest Neighbors
License: LGPLv2+ License: LGPL-2.1-or-later
URL: http://www.cs.umd.edu/~mount/ANN URL: http://www.cs.umd.edu/~mount/ANN
Source0: http://www.cs.umd.edu/~mount/ANN/Files/%{version}/%{name}_%{version}.tar.gz Source0: http://www.cs.umd.edu/~mount/ANN/Files/%{version}/%{name}_%{version}.tar.gz
Patch0: ann-make.patch Patch0: ann-make.patch
Patch1: ann-gcc43.patch Patch1: ann-gcc43.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: make BuildRequires: make
%description %description
@ -39,32 +39,30 @@ Development files needed to use ANN library.
%prep %prep
%setup -q -n %{name}_%{version} %autosetup -n %{name}_%{version} -p1
%patch0 -p1 -b .make
%patch1 -p1 -b .gcc43
%build %build
%make_build linux CFLAGS="-fPIC -DPIC $RPM_OPT_FLAGS" %make_build linux CFLAGS="-fPIC -DPIC %{build_cxxflags}" LDFLAGS="%{build_ldflags} -L../lib"
%install %install
mkdir -p $RPM_BUILD_ROOT%{_includedir}/ANN mkdir -p %{buildroot}%{_includedir}/ANN
mkdir -p $RPM_BUILD_ROOT%{_libdir} mkdir -p %{buildroot}%{_libdir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig mkdir -p %{buildroot}%{_libdir}/pkgconfig
mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p %{buildroot}%{_bindir}
install -p -m 0644 include/ANN/*.h $RPM_BUILD_ROOT%{_includedir}/ANN install -p -m 0644 include/ANN/*.h %{buildroot}%{_includedir}/ANN
install -p -m 0755 lib/libANN.so.* $RPM_BUILD_ROOT%{_libdir} install -p -m 0755 lib/libANN.so.* %{buildroot}%{_libdir}
install -p -m 0755 bin/ann2fig $RPM_BUILD_ROOT%{_bindir} 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.1
ln -s libANN.so.1.0 libANN.so ln -s libANN.so.1.0 libANN.so
popd popd
# create pkg-config file # create pkg-config file
cat << EOF > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc cat << EOF > %{buildroot}%{_libdir}/pkgconfig/%{name}.pc
prefix=%{_prefix} prefix=%{_prefix}
exec_prefix=%{_exec_prefix} exec_prefix=%{_exec_prefix}
libdir=%{_libdir} libdir=%{_libdir}
@ -94,6 +92,36 @@ EOF
%changelog %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 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild