From dd70378011c34bcc10b47f28f02abe770bdae92f Mon Sep 17 00:00:00 2001 From: mckaygerhard Date: Tue, 3 Jan 2023 16:02:25 -0400 Subject: [PATCH] fix requirements build on RPM distros for fedora,centos,rhel --- misc/fedora/multicraft.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/misc/fedora/multicraft.spec b/misc/fedora/multicraft.spec index 00895cf00..856af10bb 100644 --- a/misc/fedora/multicraft.spec +++ b/misc/fedora/multicraft.spec @@ -36,7 +36,10 @@ BuildRequires: libpng-devel BuildRequires: bzip2-devel gettext-devel sqlite-devel libzstd-devel BuildRequires: libjpeg-turbo-devel mesa-libGL-devel %else -BuildRequires: libjpeg-devel +BuildRequires: libjpeg-devel libidn-devel +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(openal) +BuildRequires: pkgconfig(vorbis) %endif BuildRequires: ncurses-devel BuildRequires: pkgconfig systemd @@ -48,16 +51,13 @@ BuildRequires: gettext-tools %else BuildRequires: desktop-file-utils %endif -BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(jsoncpp) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(luajit) -BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(sqlite3) -BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(zlib) @@ -68,10 +68,11 @@ BuildRequires: postgresql-devel %if 0%{?suse_version} > 1400 BuildRequires: postgresql-server-devel %endif -BuildRequires: libcurl-devel libidn-devel +BuildRequires: libssh-devel +BuildRequires: libcurl-devel Requires: %{name}-data = %{version} -Recommends: minetest-game Provides: minetest-runtime = %{version} +Provides: minetest-engine %description Multicraft is a fork from minetest, a voxel game written from scratch and licensed @@ -97,8 +98,8 @@ Requires(pre): shadow %if 0%{?fedora_version} > 34 Requires(pre): shadow %endif -Recommends: multicraft-game Provides: minetest-runtime = %{version} +Provides: minetest-server %{?systemd_requires} %description %{name}server @@ -196,7 +197,7 @@ LDFLAGS="-Wl,-z,relro -Wl,--as-needed -Wl,-z,now" -DENABLE_REDIS=ON \ -DENABLE_POSTGRESQL=ON \ -DPNG_PNG_INCLUDE_DIR=$(pkg-config libpng --variable=includedir) \ -%{nil}} +%{nil} %if 0%{?fedora_version} > 32 %cmake_build