From cc00a586d19d4f894a51f5cf903cfa50275bdc62 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 5 Dec 2022 22:11:42 -0500 Subject: [PATCH] [prismlauncher] support EPEL and F35 (again) --- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 6 ++++-- .../prismlauncher-qt5-nightly.spec | 6 ++++-- anda/games/prismlauncher-qt5/prismlauncher-qt5.spec | 6 ++++-- anda/games/prismlauncher/prismlauncher.spec | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 005e62e50a..122096b991 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -30,11 +30,11 @@ %global build_platform Fedora %endif -%if 0%{?rhel_version} +%if 0%{?rhel} %global build_platform RedHat %endif -%if 0%{?centos_version} +%if 0%{?centos} %global build_platform CentOS %endif @@ -132,8 +132,10 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %check %ctest +%if 0%{?fedora} > 35 appstream-util validate-relax --nonet \ %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml +%endif desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index cc5f608e61..47c5801355 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -30,11 +30,11 @@ %global build_platform Fedora %endif -%if 0%{?rhel_version} +%if 0%{?rhel} %global build_platform RedHat %endif -%if 0%{?centos_version} +%if 0%{?centos} %global build_platform CentOS %endif @@ -133,8 +133,10 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %check %ctest +%if 0%{?fedora} > 35 appstream-util validate-relax --nonet \ %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml +%endif desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop diff --git a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec index e3824bba0e..eed0727ec7 100644 --- a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec +++ b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec @@ -21,11 +21,11 @@ %global build_platform Fedora %endif -%if 0%{?rhel_version} +%if 0%{?rhel} %global build_platform RedHat %endif -%if 0%{?centos_version} +%if 0%{?centos} %global build_platform CentOS %endif @@ -116,8 +116,10 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %check %ctest +%if 0%{?fedora} > 35 appstream-util validate-relax --nonet \ %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml +%endif desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop diff --git a/anda/games/prismlauncher/prismlauncher.spec b/anda/games/prismlauncher/prismlauncher.spec index 3f5c43dfde..6b6204c4e8 100644 --- a/anda/games/prismlauncher/prismlauncher.spec +++ b/anda/games/prismlauncher/prismlauncher.spec @@ -20,11 +20,11 @@ %global build_platform Fedora %endif -%if 0%{?rhel_version} +%if 0%{?rhel} %global build_platform RedHat %endif -%if 0%{?centos_version} +%if 0%{?centos} %global build_platform CentOS %endif @@ -113,8 +113,10 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %check %ctest +%if 0%{?fedora} > 35 appstream-util validate-relax --nonet \ %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml +%endif desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop