user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/4] install/deps: fix RPM installation of some packages
Date: Sun, 24 Sep 2023 21:08:20 +0000	[thread overview]
Message-ID: <20230924210822.2771981-3-e@80x24.org> (raw)
In-Reply-To: <20230924210822.2771981-1-e@80x24.org>

Not including 3rd-party repo-sourced packages, yet (e.g. git242
and xapian14-* stuff).
---
 install/deps.perl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/install/deps.perl b/install/deps.perl
index 65547f9d..3fed4f10 100755
--- a/install/deps.perl
+++ b/install/deps.perl
@@ -1,6 +1,7 @@
 # Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # Helper script for mass installing/uninstalling with the OS package manager
+# TODO: figure out how to handle 3rd-party repo packages for CentOS 7.x
 eval 'exec perl -S $0 ${1+"$@"}' # no shebang
 if 0; # running under some shell
 use v5.12;
@@ -122,7 +123,7 @@ $profiles->{'watch-maildir'} = [ @{$profiles->{v2essential}} ];
 
 # package names which can't be mapped automatically and explicit
 # dependencies to prevent essential package removal:
-my $non_auto = { # git and perl are essential
+my $non_auto = { # git and perl (+autodie) are essential
 	git => {
 		pkg => [ qw(curl p5-TimeDate git) ],
 		rpm => [ qw(curl git) ],
@@ -153,7 +154,7 @@ my $non_auto = { # git and perl are essential
 		deb => 'libsearch-xapian-perl',
 		pkg => 'p5-Xapian',
 		pkg_add => 'xapian-bindings-perl',
-		rpm => 'Search::Xapian', # 3rd-party repo
+		rpm => [], # xapian14-bindings-perl in 3rd-party repo
 	},
 	'highlight.pm' => {
 		deb => 'libhighlight-perl',
@@ -219,11 +220,14 @@ for (qw(autodie Digest::SHA ExtUtils::MakeMaker IO::Compress Sys::Syslog
 	# qw(constant Encode Getopt::Long Exporter Storable Time::HiRes)
 	# don't need to be here since it's impossible to have `perl'
 	# on CentOS 7.x without them.
+	my $rpm = $_;
+	$rpm =~ s/::/-/g;
 	$non_auto->{$_} = {
 		deb => 'perl', # libperl5.XX, but the XX varies
 		pkg => 'perl5',
 		pkg_add => [], # perl is in the OpenBSD base system
 		pkgin => 'perl',
+		rpm => "perl-$rpm",
 	};
 }
 

  parent reply	other threads:[~2023-09-24 21:08 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-24 21:08 [PATCH 0/4] various CentOS 7.x related fixes Eric Wong
2023-09-24 21:08 ` [PATCH 1/4] test_common: force IPv4 with pre-IPv6 Net::POP3 Eric Wong
2023-09-24 21:08 ` Eric Wong [this message]
2023-09-24 21:08 ` [PATCH 3/4] lei: use scalar %SIG assignment Eric Wong
2023-09-24 21:08 ` [PATCH 4/4] xap_helper.h: add missing headers and avoid reallocarray Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230924210822.2771981-3-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).