Compare commits
24 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
312afe1b85 | ||
|
|
94f0b4d2df | ||
|
|
d40fb93395 | ||
|
|
98afadf50b | ||
|
|
a9742827b8 | ||
|
|
d3d360cec0 | ||
|
|
624b0c8f6b | ||
|
|
b1ca6c9418 | ||
|
|
9d13e61eef | ||
|
|
620278fd3a | ||
|
|
b596c50d73 | ||
|
|
6686d484ab | ||
|
|
fa363f4c86 | ||
|
|
c01f739913 | ||
|
|
e4ec92560c | ||
|
|
0573a4dac7 | ||
|
|
be1c27fdd6 | ||
|
|
6b35d57f2d | ||
|
|
2c2ceef10b | ||
|
|
1cdb415992 | ||
|
|
5dca1175b5 | ||
|
|
d45ecb62ea | ||
|
|
540649567c | ||
|
|
426392572b |
2 changed files with 90 additions and 24 deletions
|
|
@ -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
|
||||||
|
|
|
||||||
100
ann.spec
100
ann.spec
|
|
@ -1,14 +1,15 @@
|
||||||
Name: ann
|
Name: ann
|
||||||
Version: 1.1.2
|
Version: 1.1.2
|
||||||
Release: 12%{?dist}
|
Release: 32%{?dist}
|
||||||
Summary: Library for searching Approximate Nearest Neighbors
|
Summary: Library for searching Approximate Nearest Neighbors
|
||||||
|
|
||||||
Group: Applications/System
|
License: LGPL-2.1-or-later
|
||||||
License: LGPLv2+
|
|
||||||
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: make
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
|
|
@ -25,14 +26,12 @@ data structures.
|
||||||
|
|
||||||
%package libs
|
%package libs
|
||||||
Summary: Runtime files for the ANN library
|
Summary: Runtime files for the ANN library
|
||||||
Group: System Environment/Libraries
|
|
||||||
|
|
||||||
%description libs
|
%description libs
|
||||||
Runtime files needed to use ANN library.
|
Runtime files needed to use ANN library.
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development files for the ANN library
|
Summary: Development files for the ANN library
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name}-libs = %{version}-%{release}
|
Requires: %{name}-libs = %{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
|
|
@ -40,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 %{?_smp_mflags} 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}
|
||||||
|
|
@ -80,11 +77,6 @@ Cflags: -I\${includedir}
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
||||||
%post libs -p /sbin/ldconfig
|
|
||||||
|
|
||||||
%postun libs -p /sbin/ldconfig
|
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
|
|
||||||
|
|
@ -100,6 +92,68 @@ 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
|
||||||
|
- 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
|
||||||
|
|
||||||
|
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-13
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-12
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-12
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue