From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2569C433FF for ; Wed, 14 Aug 2019 17:25:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF24520665 for ; Wed, 14 Aug 2019 17:25:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565803538; bh=bF+qExikVFvyiuN7P/QK2vGkwAhCy5AbjsaJnvm9Gk0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IHpxZAyEDRLb3w5vfpLalCU5+SvUMDiZpTKuZChQltTsxwwJl7iU/OR9Z2FJMZouQ yrYpQKpO6F0HOmtbnKAi6EEpvtoaP0T3FJM/tr/1eufS5p7avQotzeBwCTu1J2ROlL xcVo3x7Ac+PtnA6yBMd2ngwlTQNkeHVkrNF21vHk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728976AbfHNRFo (ORCPT ); Wed, 14 Aug 2019 13:05:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:54570 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728921AbfHNRFi (ORCPT ); Wed, 14 Aug 2019 13:05:38 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3E04E216F4; Wed, 14 Aug 2019 17:05:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802337; bh=bF+qExikVFvyiuN7P/QK2vGkwAhCy5AbjsaJnvm9Gk0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PPT3jh7xPRo8/NwdAqZ/qAFg1gcwQgifXB18nulU9/QEbc2lgSTLUIFWU3Ncdmov/ X4oy5RE36Dh11p9Z6Ij1qQIR9XPxNPf/SzlPikSiQOOI0pA+DBmvJaIYsBlPJOTtyM QxnhVsBUq16hkJ6On9D2UDfrCY/PbG61cYsypqBE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.2 059/144] scripts/sphinx-pre-install: fix latexmk dependencies Date: Wed, 14 Aug 2019 19:00:15 +0200 Message-Id: <20190814165802.299214378@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814165759.466811854@linuxfoundation.org> References: <20190814165759.466811854@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 353290a9eb5362a80bc8e52fcd7eb77a30f48afc ] The name of the package with carries latexmk is different on two distros: - On OpenSUSE, latexmk is packaged as "texlive-latexmk-bin" - On Mageia, latexmk is packaged at "texlive-collection-basic" Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- scripts/sphinx-pre-install | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install index 4cc2b3ee5209f..1f9f0a334c24f 100755 --- a/scripts/sphinx-pre-install +++ b/scripts/sphinx-pre-install @@ -447,6 +447,8 @@ sub give_opensuse_hints() "texlive-zapfding", ); + $map{"latexmk"} = "texlive-latexmk-bin"; + check_rpm_missing(\@suse_tex_pkgs, 2) if ($pdf); check_missing_tex(2) if ($pdf); check_missing(\%map); @@ -472,6 +474,8 @@ sub give_mageia_hints() "texlive-fontsextra", ); + $map{"latexmk"} = "texlive-collection-basic"; + check_rpm_missing(\@tex_pkgs, 2) if ($pdf); check_missing(\%map); -- 2.20.1