From 1e890a8a0a6705ea59fc9c53f4265768d0ccdab6 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Fri, 5 Oct 2012 13:43:37 -0400 Subject: [PATCH] gnome-shell-build-setup.sh: install libdb on Fedora 18. For F18, db4-devel doesn't install the main -ldb and db.h any more, so we need the libdb-devel package and Berkeley DB 5. --- tools/build/gnome-shell-build-setup.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/build/gnome-shell-build-setup.sh b/tools/build/gnome-shell-build-setup.sh index fd511aa1f..8ff7fbbc9 100755 --- a/tools/build/gnome-shell-build-setup.sh +++ b/tools/build/gnome-shell-build-setup.sh @@ -98,7 +98,7 @@ xcb: f:xcb-util-devel d:libx11-xcb-dev # startup-notification # Other libraries cracklib: fs:cracklib-devel d:libcrack2-dev # libpwquality cups: fs:cups-devel d:libcups2-dev # gnome-control-center -db4: f:db4-devel d:libdb-dev # evolution-data-server +libdb: d:libdb-dev # evolution-data-server - see below for Fedora icu: f:libicu-devel d:libicu-dev # WebKit libacl: f:libacl-devel d:libacl1-dev # gudev libcurl: f:libcurl-devel # liboauth. See below for Debian @@ -212,6 +212,14 @@ if test "x$system" = xFedora ; then reqd="$reqd gettext-devel" fi + # For evolution-data-server: + # /usr/include/db.h moved packages in Fedora 18 + if expr $version \>= 18 > /dev/null ; then + reqd="$reqd libdb-devel" + else + reqd="$reqd db4-devel" + fi + echo -n "Computing packages to install ... " for pkg in $reqd ; do if ! rpm -q --whatprovides $pkg > /dev/null 2>&1; then