diff --git a/.gitignore b/.gitignore index a200c9a..483590f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/ann_1.1.2.tar.gz +ann_1.1.1.tar.gz diff --git a/ann-gcc43.patch b/ann-gcc43.patch index 677d7ea..eb3cc9d 100644 --- a/ann-gcc43.patch +++ b/ann-gcc43.patch @@ -1,6 +1,30 @@ -diff -Naur ann_1.1.2.orig/src/kd_dump.cpp ann_1.1.2/src/kd_dump.cpp ---- ann_1.1.2.orig/src/kd_dump.cpp 2010-01-28 05:40:01.000000000 +0100 -+++ ann_1.1.2/src/kd_dump.cpp 2013-03-22 15:59:40.675142146 +0100 +diff -Nru ann_1.1.1.orig/ann2fig/ann2fig.cpp ann_1.1.1/ann2fig/ann2fig.cpp +--- ann_1.1.1.orig/ann2fig/ann2fig.cpp 2006-08-04 21:46:28.000000000 +0200 ++++ ann_1.1.1/ann2fig/ann2fig.cpp 2008-08-14 20:13:06.000000000 +0200 +@@ -41,6 +41,8 @@ + //---------------------------------------------------------------------- + + #include // C standard I/O ++#include // C standard string ++#include // C standard lib + #include // file I/O + #include // string manipulation + #include // all ANN includes +diff -Nru ann_1.1.1.orig/src/ANN.cpp ann_1.1.1/src/ANN.cpp +--- ann_1.1.1.orig/src/ANN.cpp 2006-08-04 21:46:27.000000000 +0200 ++++ ann_1.1.1/src/ANN.cpp 2008-08-14 20:13:06.000000000 +0200 +@@ -24,6 +24,8 @@ + // Added performance counting to annDist() + //---------------------------------------------------------------------- + ++#include // C standard lib ++ + #include // all ANN includes + #include // ANN performance + +diff -Nru ann_1.1.1.orig/src/kd_dump.cpp ann_1.1.1/src/kd_dump.cpp +--- ann_1.1.1.orig/src/kd_dump.cpp 2006-08-04 21:46:27.000000000 +0200 ++++ ann_1.1.1/src/kd_dump.cpp 2008-08-14 20:15:03.000000000 +0200 @@ -31,6 +31,9 @@ // desired.) //---------------------------------------------------------------------- @@ -11,11 +35,11 @@ diff -Naur ann_1.1.2.orig/src/kd_dump.cpp ann_1.1.2/src/kd_dump.cpp #include "kd_tree.h" // kd-tree declarations #include "bd_tree.h" // bd-tree declarations -diff -Naur ann_1.1.2.orig/test/ann_test.cpp ann_1.1.2/test/ann_test.cpp ---- ann_1.1.2.orig/test/ann_test.cpp 2010-01-28 05:40:01.000000000 +0100 -+++ ann_1.1.2/test/ann_test.cpp 2013-03-22 15:59:40.676142171 +0100 -@@ -37,6 +37,9 @@ - // Allow round-off error in validation test +diff -Nru ann_1.1.1.orig/test/ann_test.cpp ann_1.1.1/test/ann_test.cpp +--- ann_1.1.1.orig/test/ann_test.cpp 2006-08-04 21:46:27.000000000 +0200 ++++ ann_1.1.1/test/ann_test.cpp 2008-08-14 20:13:06.000000000 +0200 +@@ -34,6 +34,9 @@ + // Added planted distribution //---------------------------------------------------------------------- +#include // C standard string @@ -23,4 +47,4 @@ diff -Naur ann_1.1.2.orig/test/ann_test.cpp ann_1.1.2/test/ann_test.cpp + #include // clock #include // math routines - #include // C string ops + #include // C string ops diff --git a/ann-make.patch b/ann-make.patch index ead61ec..0c5d7fc 100644 --- a/ann-make.patch +++ b/ann-make.patch @@ -1,6 +1,6 @@ -diff -Naur ann_1.1.2.orig/Make-config ann_1.1.2/Make-config ---- ann_1.1.2.orig/Make-config 2010-01-28 05:40:01.000000000 +0100 -+++ ann_1.1.2/Make-config 2013-03-22 15:56:58.290617102 +0100 +diff -Nru ann_1.1.1.orig/Make-config ann_1.1.1/Make-config +--- ann_1.1.1.orig/Make-config 2006-08-04 21:46:26.000000000 +0200 ++++ ann_1.1.1/Make-config 2008-08-14 19:35:57.000000000 +0200 @@ -67,6 +67,14 @@ # files in the MS_WIN32 directory). #----------------------------------------------------------------------------- @@ -11,14 +11,14 @@ 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++: $(MAKE) targets \ -diff -Naur ann_1.1.2.orig/Makefile ann_1.1.2/Makefile ---- ann_1.1.2.orig/Makefile 2010-01-28 05:40:01.000000000 +0100 -+++ ann_1.1.2/Makefile 2013-03-22 15:56:58.290617102 +0100 +diff -Nru ann_1.1.1.orig/Makefile ann_1.1.1/Makefile +--- ann_1.1.1.orig/Makefile 2006-08-04 21:46:26.000000000 +0200 ++++ ann_1.1.1/Makefile 2008-08-14 19:28:16.000000000 +0200 @@ -56,7 +56,7 @@ #----------------------------------------------------------------------------- # main make entry point @@ -28,9 +28,9 @@ diff -Naur ann_1.1.2.orig/Makefile ann_1.1.2/Makefile cd src ; $(MAKE) $@ cd test ; $(MAKE) $@ cd sample ; $(MAKE) $@ -diff -Naur ann_1.1.2.orig/src/Makefile ann_1.1.2/src/Makefile ---- ann_1.1.2.orig/src/Makefile 2010-01-28 05:40:01.000000000 +0100 -+++ ann_1.1.2/src/Makefile 2013-03-22 15:56:58.290617102 +0100 +diff -Nru ann_1.1.1.orig/src/Makefile ann_1.1.1/src/Makefile +--- ann_1.1.1.orig/src/Makefile 2006-08-04 21:46:27.000000000 +0200 ++++ ann_1.1.1/src/Makefile 2008-08-14 19:36:45.000000000 +0200 @@ -56,7 +56,8 @@ $(LIBDIR)/$(ANNLIB): $(OBJECTS) $(MAKELIB) $(ANNLIB) $(OBJECTS) @@ -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 diff --git a/ann.spec b/ann.spec index 9aae004..b4e758a 100644 --- a/ann.spec +++ b/ann.spec @@ -1,15 +1,15 @@ Name: ann -Version: 1.1.2 -Release: 32%{?dist} +Version: 1.1.1 +Release: 3%{?dist} Summary: Library for searching Approximate Nearest Neighbors -License: LGPL-2.1-or-later +Group: Applications/System +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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -26,12 +26,14 @@ data structures. %package libs Summary: Runtime files for the ANN library +Group: System Environment/Libraries %description libs Runtime files needed to use ANN library. %package devel Summary: Development files for the ANN library +Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} %description devel @@ -39,177 +41,58 @@ 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} +rm -rf $RPM_BUILD_ROOT -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} +mkdir -p $RPM_BUILD_ROOT%{_includedir}/ANN +mkdir -p $RPM_BUILD_ROOT%{_libdir} +mkdir -p $RPM_BUILD_ROOT%{_bindir} -pushd %{buildroot}%{_libdir} +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 $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 -prefix=%{_prefix} -exec_prefix=%{_exec_prefix} -libdir=%{_libdir} -includedir=%{_includedir} -Name: %{name} -Description: Library for searching Approximate Nearest Neighbors -Version: %{version} -Requires: -Libs: -L\${libdir} -lANN -Cflags: -I\${includedir} -EOF +%clean +rm -rf $RPM_BUILD_ROOT + + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig %files +%defattr(-,root,root,-) %{_bindir}/* %files libs +%defattr(-,root,root,-) %doc Copyright.txt License.txt ReadMe.txt %{_libdir}/*.so.* %files devel +%defattr(-,root,root,-) %doc doc/ANNmanual.pdf %{_includedir}/ANN %{_libdir}/*.so -%{_libdir}/pkgconfig/%{name}.pc %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 - -* Wed Jan 19 2022 Fedora Release Engineering - 1.1.2-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 1.1.2-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.1.2-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jul 31 2020 Fedora Release Engineering - 1.1.2-19 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.1.2-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 22 2020 Tom Stellard - 1.1.2-17 -- Use make macros -- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro - -* Tue Jan 28 2020 Fedora Release Engineering - 1.1.2-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 1.1.2-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 1.1.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 1.1.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 1.1.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 1.1.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.1.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.1.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 1.1.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jun 16 2015 Fedora Release Engineering - 1.1.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 1.1.2-6 -- Rebuilt for GCC 5 C++11 ABI change - -* Fri Aug 15 2014 Fedora Release Engineering - 1.1.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 18 2013 Dan Horák - 1.1.2-3 -- add pkg-config file (#997212) - -* Sat Aug 03 2013 Fedora Release Engineering - 1.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Mar 22 2013 Ralf Corsépius - 1.1.2-1 -- Upstream update. -- Rebase patches. -- Modernize spec. - -* Wed Feb 13 2013 Fedora Release Engineering - 1.1.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 1.1.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Feb 28 2012 Fedora Release Engineering - 1.1.1-7 -- Rebuilt for c++ ABI breakage - -* Thu Jan 12 2012 Fedora Release Engineering - 1.1.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 1.1.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jul 24 2009 Fedora Release Engineering - 1.1.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - * Mon Feb 23 2009 Fedora Release Engineering - 1.1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 3ec29a0..77e7259 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7ffaacc7ea79ca39d4958a6378071365 ann_1.1.2.tar.gz +b6247e4a34e8a5e122ebf299cd51f871 ann_1.1.1.tar.gz