From 1aad85a4f944c87d2dafe4b6bf57f55553c2ab4c Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 15 Jan 2022 02:53:46 +0100 Subject: [PATCH] Add openmandriva support to rpm spec --- cmake/Rpm.cmake | 17 +++++++++++++---- dist/unix/strawberry.spec.in | 4 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/cmake/Rpm.cmake b/cmake/Rpm.cmake index 1ca397601..c92c0e13f 100644 --- a/cmake/Rpm.cmake +++ b/cmake/Rpm.cmake @@ -12,10 +12,17 @@ if (LSB_RELEASE_EXEC AND RPMBUILD_EXEC) OUTPUT_VARIABLE DIST_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE ) - execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -ds | tr '[:upper:]' '[:lower:]' | sed 's/\"//g' | sed 's/\\.//g' | cut -d' ' -f3" - OUTPUT_VARIABLE DIST_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE - ) + if (${DIST_NAME} STREQUAL "openmandrivalinux") + execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -ds | tr '[:upper:]' '[:lower:]' | sed 's/\"//g' | sed 's/\\./0/g' | cut -d' ' -f3" + OUTPUT_VARIABLE DIST_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + else() + execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -ds | tr '[:upper:]' '[:lower:]' | sed 's/\"//g' | sed 's/\\.//g' | cut -d' ' -f3" + OUTPUT_VARIABLE DIST_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + endif() if (DIST_NAME) message(STATUS "Distro Name: ${DIST_NAME}") @@ -44,6 +51,8 @@ if (LSB_RELEASE_EXEC AND RPMBUILD_EXEC) set(RPM_DISTRO "el${DIST_VERSION}") elseif (${DIST_NAME} STREQUAL "mageia" AND DIST_RELEASE) set(RPM_DISTRO "mga${DIST_RELEASE}") + elseif (${DIST_NAME} STREQUAL "openmandrivalinux" AND DIST_VERSION) + set(RPM_DISTRO "omv${DIST_VERSION}") endif() if(NOT RPM_DISTRO) diff --git a/dist/unix/strawberry.spec.in b/dist/unix/strawberry.spec.in index ed58ab469..c774f54ac 100644 --- a/dist/unix/strawberry.spec.in +++ b/dist/unix/strawberry.spec.in @@ -138,7 +138,7 @@ Features: export CXXFLAGS="-fPIC $RPM_OPT_FLAGS" %endif %{cmake} -DQT_VERSION_MAJOR=@QT_VERSION_MAJOR@ -%if 0%{?centos} || (0%{?mageia} && 0%{?mageia} <= 7) +%if 0%{?centos} || (0%{?mageia} && 0%{?mageia} <= 7) || "%{?_vendor}" == "openmandriva" %make_build %else %cmake_build @@ -148,7 +148,7 @@ Features: %if 0%{?centos} %make_install %else -%if 0%{?mageia} +%if 0%{?mageia} || "%{?_vendor}" == "openmandriva" %make_install -C build %else %cmake_install