public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Simone Caronni <negativo17@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/barman] epel10: Import changes from Fedora's 3.20 version
Date: Tue, 08 Sep 2026 08:03:33 GMT [thread overview]
Message-ID: <178885461387.1.12042129953032085327.rpms-barman-5d42f14d951a@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/barman
Branch : epel10
Commit : 5d42f14d951a826c57f455e394a34b39f7da5c83
Author : Simone Caronni <negativo17@gmail.com>
Date : 2026-09-08T10:02:38+02:00
Stats : +51/-43 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/barman/c/5d42f14d951a826c57f455e394a34b39f7da5c83?branch=epel10
Log:
Import changes from Fedora's 3.20 version
---
diff --git a/barman.spec b/barman.spec
index 5c6564a..038f5f4 100644
--- a/barman.spec
+++ b/barman.spec
@@ -1,5 +1,5 @@
Name: barman
-Version: 3.18.0
+Version: 3.20.0
Release: %autorelease
Summary: Backup and Recovery Manager for PostgreSQL
License: GPL-3.0-only
@@ -11,12 +11,10 @@ Source1: %{name}.cron
Source2: %{name}.logrotate
BuildRequires: python3-devel
-BuildRequires: python3-setuptools
# https://docs.fedoraproject.org/en-US/packaging-guidelines/CronFiles/#_cron_job_files_packaging:
Requires: cronie
Requires: logrotate
-Requires(pre): shadow-utils
Requires: rsync >= 3.0.4
Requires: %{py3_dist argcomplete}
Requires: %{py3_dist barman}
@@ -52,6 +50,14 @@ find -type f -executable -exec sed -i '1s=^#!/usr/bin/\(python\|env python\)[23]
%generate_buildrequires
%pyproject_buildrequires
+# Create a sysusers.d config file
+cat >barman.sysusers.conf <<EOF
+u barman - 'Backup and Recovery Manager for PostgreSQL' %{_sharedstatedir}/%{name} /bin/bash
+EOF
+
+# Remove duplicate with old name
+rm -f docs/_build/man/%{name}-list_backups.1*
+
%build
%pyproject_wheel
@@ -64,13 +70,19 @@ mkdir -p %{buildroot}%{_sysconfdir}/cron.d/
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/
mkdir -p %{buildroot}%{_sharedstatedir}/%{name}
mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
+mkdir -p %{buildroot}%{_mandir}/man1/
+mkdir -p %{buildroot}%{_mandir}/man5/
mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/
+mkdir -p %{buildroot}%{_sysusersdir}/
+install -p -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
+install -p -m 644 docs/_build/man/%{name}.5 %{buildroot}%{_mandir}/man5/
install -p -m 644 docs/%{name}.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
install -p -m 644 docs/%{name}.d/* %{buildroot}%{_sysconfdir}/%{name}/conf.d
install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/cron.d/%{name}
install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
install -p -m 644 scripts/%{name}.bash_completion %{buildroot}%{_datadir}/bash-completion/completions/%{name}
+install -p -m 644 barman.sysusers.conf %{buildroot}%{_sysusersdir}/barman.conf
sed -i 's|/etc/%{name}.d|/etc/%{name}/conf.d|g' %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
@@ -78,40 +90,10 @@ sed -i 's|/etc/%{name}.d|/etc/%{name}/conf.d|g' %{buildroot}%{_sysconfdir}/%{nam
%{_bindir}/%{name}
%{_datadir}/bash-completion/completions/%{name}
%{_mandir}/man1/%{name}.1*
-%{_mandir}/man5/%{name}.5*
-%dir %{_sysconfdir}/%{name}/
-%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
-%config(noreplace) %{_sysconfdir}/%{name}/conf.d/
-%config(noreplace) %{_sysconfdir}/cron.d/%{name}
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%attr(700,%{name},%{name}) %dir %{_sharedstatedir}/%{name}
-%attr(755,%{name},%{name}) %dir %{_localstatedir}/log/%{name}
-
-%files cli
-%{_bindir}/%{name}-cloud-backup
-%{_bindir}/%{name}-cloud-backup-delete
-%{_bindir}/%{name}-cloud-backup-keep
-%{_bindir}/%{name}-cloud-backup-list
-%{_bindir}/%{name}-cloud-backup-show
-%{_bindir}/%{name}-cloud-check-wal-archive
-%{_bindir}/%{name}-cloud-restore
-%{_bindir}/%{name}-cloud-wal-archive
-%{_bindir}/%{name}-cloud-wal-restore
-%{_bindir}/%{name}-wal-archive
-%{_bindir}/%{name}-wal-restore
%{_mandir}/man1/%{name}-archive-wal.1*
%{_mandir}/man1/%{name}-backup.1*
%{_mandir}/man1/%{name}-check.1*
%{_mandir}/man1/%{name}-check-backup.1*
-%{_mandir}/man1/%{name}-cloud-backup.1*
-%{_mandir}/man1/%{name}-cloud-backup-delete.1*
-%{_mandir}/man1/%{name}-cloud-backup-keep.1*
-%{_mandir}/man1/%{name}-cloud-backup-list.1*
-%{_mandir}/man1/%{name}-cloud-backup-show.1*
-%{_mandir}/man1/%{name}-cloud-check-wal-archive.1*
-%{_mandir}/man1/%{name}-cloud-restore.1*
-%{_mandir}/man1/%{name}-cloud-wal-archive.1*
-%{_mandir}/man1/%{name}-cloud-wal-restore.1*
%{_mandir}/man1/%{name}-config-switch.1*
%{_mandir}/man1/%{name}-config-update.1*
%{_mandir}/man1/%{name}-cron.1*
@@ -120,14 +102,15 @@ sed -i 's|/etc/%{name}.d|/etc/%{name}/conf.d|g' %{buildroot}%{_sysconfdir}/%{nam
%{_mandir}/man1/%{name}-generate-manifest.1*
%{_mandir}/man1/%{name}-get-wal.1*
%{_mandir}/man1/%{name}-keep.1*
-%{_mandir}/man1/%{name}-list_backups.1*
+%{_mandir}/man1/%{name}-list-backups.1*
%{_mandir}/man1/%{name}-list-files.1*
-%{_mandir}/man1/%{name}-list-processes.1.gz
+%{_mandir}/man1/%{name}-list-processes.1*
%{_mandir}/man1/%{name}-list-servers.1*
%{_mandir}/man1/%{name}-lock-directory-cleanup.1*
%{_mandir}/man1/%{name}-put-wal.1*
%{_mandir}/man1/%{name}-rebuild-xlogdb.1*
%{_mandir}/man1/%{name}-receive-wal.1*
+%{_mandir}/man1/%{name}-recover.1*
%{_mandir}/man1/%{name}-replication-status.1*
%{_mandir}/man1/%{name}-restore.1*
%{_mandir}/man1/%{name}-show-backup.1*
@@ -138,9 +121,40 @@ sed -i 's|/etc/%{name}.d|/etc/%{name}/conf.d|g' %{buildroot}%{_sysconfdir}/%{nam
%{_mandir}/man1/%{name}-sync-backup.1*
%{_mandir}/man1/%{name}-sync-info.1*
%{_mandir}/man1/%{name}-sync-wals.1*
-%{_mandir}/man1/%{name}-terminate-process.1.gz
+%{_mandir}/man1/%{name}-terminate-process.1*
%{_mandir}/man1/%{name}-verify.1*
%{_mandir}/man1/%{name}-verify-backup.1*
+%{_mandir}/man5/%{name}.5*
+%dir %{_sysconfdir}/%{name}/
+%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%config(noreplace) %{_sysconfdir}/%{name}/conf.d/
+%config(noreplace) %{_sysconfdir}/cron.d/%{name}
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%attr(700,%{name},%{name}) %dir %{_sharedstatedir}/%{name}
+%attr(755,%{name},%{name}) %dir %{_localstatedir}/log/%{name}
+%{_sysusersdir}/barman.conf
+
+%files cli
+%{_bindir}/%{name}-cloud-backup
+%{_bindir}/%{name}-cloud-backup-delete
+%{_bindir}/%{name}-cloud-backup-keep
+%{_bindir}/%{name}-cloud-backup-list
+%{_bindir}/%{name}-cloud-backup-show
+%{_bindir}/%{name}-cloud-check-wal-archive
+%{_bindir}/%{name}-cloud-restore
+%{_bindir}/%{name}-cloud-wal-archive
+%{_bindir}/%{name}-cloud-wal-restore
+%{_bindir}/%{name}-wal-archive
+%{_bindir}/%{name}-wal-restore
+%{_mandir}/man1/%{name}-cloud-backup.1*
+%{_mandir}/man1/%{name}-cloud-backup-delete.1*
+%{_mandir}/man1/%{name}-cloud-backup-keep.1*
+%{_mandir}/man1/%{name}-cloud-backup-list.1*
+%{_mandir}/man1/%{name}-cloud-backup-show.1*
+%{_mandir}/man1/%{name}-cloud-check-wal-archive.1*
+%{_mandir}/man1/%{name}-cloud-restore.1*
+%{_mandir}/man1/%{name}-cloud-wal-archive.1*
+%{_mandir}/man1/%{name}-cloud-wal-restore.1*
%{_mandir}/man1/%{name}-wal-archive.1*
%{_mandir}/man1/%{name}-wal-restore.1*
@@ -148,12 +162,6 @@ sed -i 's|/etc/%{name}.d|/etc/%{name}/conf.d|g' %{buildroot}%{_sysconfdir}/%{nam
%license LICENSE
%doc AUTHORS README.rst RELNOTES.md
-%pre
-getent group %{name} >/dev/null || groupadd -r %{name}
-getent passwd %{name} >/dev/null || \
- useradd -r -g %{name} -d %{_sharedstatedir}/%{name} -s /bin/bash \
- -c "Backup and Recovery Manager for PostgreSQL" %{name}
-exit 0
%changelog
%autochangelog
diff --git a/sources b/sources
index c1b1f16..3f159f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (barman-release-3.18.0.tar.gz) = 76c6d68148fa40c322cbc0b36305a259be992fb79f428185124aaefa69da70b859e265982101e4133231a7e3c64bfd537343e67d6ccd9f5ac23989d763ebcd4b
+SHA512 (barman-release-3.20.0.tar.gz) = f9d32c9a90fbf53415f837d095adfbce9205cca0ef545c485bece9eabce76ec9c243dff0032363f96fcc2969083ed19773b33ccdee8ec4190012746f6c4a50a2
reply other threads:[~2026-09-08 8:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178885461387.1.12042129953032085327.rpms-barman-5d42f14d951a@fedoraproject.org \
--to=negativo17@gmail.com \
--cc=git-commits@fedoraproject.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox