dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add openmandriva support to rpm spec

Browse Source
This commit is contained in:
Jonas Kvinge
2022-01-15 02:53:46 +01:00
parent fbd2993239
commit 1aad85a4f9
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmake/Rpm.cmake
View File

@@ -12,10 +12,17 @@ if (LSB_RELEASE_EXEC AND RPMBUILD_EXEC)
OUTPUT_VARIABLE DIST_RELEASE OUTPUT_VARIABLE DIST_RELEASE
OUTPUT_STRIP_TRAILING_WHITESPACE 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" if (${DIST_NAME} STREQUAL "openmandrivalinux")
OUTPUT_VARIABLE DIST_VERSION execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -ds | tr '[:upper:]' '[:lower:]' | sed 's/\"//g' | sed 's/\\./0/g' | cut -d' ' -f3"
OUTPUT_STRIP_TRAILING_WHITESPACE 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) if (DIST_NAME)
message(STATUS "Distro Name: ${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}") set(RPM_DISTRO "el${DIST_VERSION}")
elseif (${DIST_NAME} STREQUAL "mageia" AND DIST_RELEASE) elseif (${DIST_NAME} STREQUAL "mageia" AND DIST_RELEASE)
set(RPM_DISTRO "mga${DIST_RELEASE}") set(RPM_DISTRO "mga${DIST_RELEASE}")
elseif (${DIST_NAME} STREQUAL "openmandrivalinux" AND DIST_VERSION)
set(RPM_DISTRO "omv${DIST_VERSION}")
endif() endif()
if(NOT RPM_DISTRO) if(NOT RPM_DISTRO)

4
dist/unix/strawberry.spec.in vendored
View File

@@ -138,7 +138,7 @@ Features:
export CXXFLAGS="-fPIC $RPM_OPT_FLAGS" export CXXFLAGS="-fPIC $RPM_OPT_FLAGS"
%endif %endif
%{cmake} -DQT_VERSION_MAJOR=@QT_VERSION_MAJOR@ %{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 %make_build
%else %else
%cmake_build %cmake_build
@@ -148,7 +148,7 @@ Features:
%if 0%{?centos} %if 0%{?centos}
%make_install %make_install
%else %else
%if 0%{?mageia} %if 0%{?mageia} || "%{?_vendor}" == "openmandriva"
%make_install -C build %make_install -C build
%else %else
%cmake_install %cmake_install