From e4bb023ad60e2cd7e4120d88f49bdfe051b8e6a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Fri, 22 Mar 2013 16:15:44 +0100 Subject: [PATCH 1/2] Merge cleanup. --- ann.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/ann.spec b/ann.spec index fc31130..e94ed03 100644 --- a/ann.spec +++ b/ann.spec @@ -91,9 +91,6 @@ popd - 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 From 29953b8bcbd9eab31f313441a349c63a6e71866f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Sun, 18 Aug 2013 16:10:39 +0200 Subject: [PATCH 2/2] - add pkg-config file (#997212) --- ann.spec | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/ann.spec b/ann.spec index e94ed03..8a96bf5 100644 --- a/ann.spec +++ b/ann.spec @@ -1,6 +1,6 @@ Name: ann Version: 1.1.2 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Library for searching Approximate Nearest Neighbors Group: Applications/System @@ -52,6 +52,7 @@ make %{?_smp_mflags} linux CFLAGS="-fPIC -DPIC $RPM_OPT_FLAGS" %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} install -p -m 0644 include/ANN/*.h $RPM_BUILD_ROOT%{_includedir}/ANN @@ -63,6 +64,21 @@ 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 +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 + %post libs -p /sbin/ldconfig @@ -83,9 +99,13 @@ popd %doc doc/ANNmanual.pdf %{_includedir}/ANN %{_libdir}/*.so +%{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Aug 18 2013 Dan Horák - 1.1.2-3 +- add pkg-config file (#997212) + * Fri Mar 22 2013 Ralf Corsépius - 1.1.2-1 - Upstream update. - Rebase patches.