install libdispatch on fedora from repository

trunkmaster · Jan 3, 2025 · 8945649 · 8945649
1 parent a9d5384
commit 8945649
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Packaging/Sources/0_build_libdispatch.sh b/Packaging/Sources/0_build_libdispatch.sh
@@ -10,6 +10,11 @@ if [ "${OS_ID}" = "debian" ] || [ "${OS_ID}" = "ubuntu" ]; then
 	${ECHO} "Debian-based Linux distribution: calling 'apt-get install'."
 	sudo apt-get install -q -y ${BUILD_TOOLS} ${RUNTIME_DEPS} || exit 1
 else
+	if [ "${OS_ID}" = "fedora" ]; then
+		${ECHO} "No need to build - installing 'libdispatch-devel' from Fedora repository..."
+		sudo dnf -y install libdispatch-devel || exit 1
+		exit 0
+	fi
 	${ECHO} "RedHat-based Linux distribution: calling 'yum -y install'."
 	SPEC_FILE=${PROJECT_DIR}/Libraries/libdispatch/libdispatch.spec
 	DEPS=`rpmspec -q --buildrequires ${SPEC_FILE} | awk -c '{print $1}'`

diff --git a/Packaging/Sources/1_build_libcorefoundation.sh b/Packaging/Sources/1_build_libcorefoundation.sh
@@ -13,7 +13,7 @@ else
 	${ECHO} ">>> Installing ${OS_ID} packages for CoreFoundation build"
 	${ECHO} "RedHat-based Linux distribution: calling 'yum -y install'."
 	SPEC_FILE=${PROJECT_DIR}/Libraries/libcorefoundation/libcorefoundation.spec
-	DEPS=`rpmspec -q --buildrequires ${SPEC_FILE} | grep -v "libdispatch-devel" |awk -c '{print $1}'`
+	DEPS=`rpmspec -q --buildrequires ${SPEC_FILE} | awk -c '{print $1}'`
 	sudo yum -y install ${DEPS} git || exit 1
 fi