[packages/rpm/rpm-4_5] - use specific db version even if it's not default one

qboosh qboosh at pld-linux.org
Tue Oct 9 20:43:26 CEST 2012


commit 48beb522e79f958a4f6cc76e04ac9b53b0f98e49
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Oct 9 20:43:25 2012 +0200

    - use specific db version even if it's not default one

 rpm.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 2dea47b..8a99e5a 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -901,7 +901,7 @@ sed -i \
 
 # pass CC and CXX too in case of building with some older configure macro
 # disable perl-RPM2 build, we have it in separate spec
-CPPFLAGS="%{rpmcppflags} -I/usr/include/ossp-uuid"
+CPPFLAGS="%{rpmcppflags} -I/usr/include/ossp-uuid -I/usr/include/%{reqdb_pkg}"
 %configure \
 	CC="%{__newcc}" \
 	CXX="%{__newcxx}" \
@@ -921,7 +921,7 @@ CPPFLAGS="%{rpmcppflags} -I/usr/include/ossp-uuid"
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
 	CPP="%{__cpp}" \
-	libdb_la=%{_libdir}/libdb.la \
+	libdb_la=%{_libdir}/libdb-%(echo %{reqdb_pkg} | sed -e 's/^db//').la \
 	pylibdir=%{py_libdir} \
 	myLDFLAGS="%{rpmldflags}" \
 	staticLDFLAGS=%{?with_static:-all-static}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/48beb522e79f958a4f6cc76e04ac9b53b0f98e49



More information about the pld-cvs-commit mailing list