From 9e3dc22dd87e372208c99dd3cda69395947e99eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:19:41 +0000 Subject: [PATCH 1/2] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- monotone.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/monotone.spec b/monotone.spec index 114c523..ecd8c34 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,6 +1,6 @@ Name: monotone Version: 1.1 -Release: 51%{?dist} +Release: 52%{?dist} Summary: A free, distributed version control system # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -208,6 +208,9 @@ exit 0 %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.1-52 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 1.1-51 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 2cc4cd8a8c0009617f71f884b2332177d8ead0ad Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 28 Aug 2025 08:17:38 +0200 Subject: [PATCH 2/2] Update for current users and groups guidelines. --- monotone-server-sysusers.conf | 2 ++ monotone.spec | 18 +++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 monotone-server-sysusers.conf diff --git a/monotone-server-sysusers.conf b/monotone-server-sysusers.conf new file mode 100644 index 0000000..deb48d3 --- /dev/null +++ b/monotone-server-sysusers.conf @@ -0,0 +1,2 @@ +#Type Name ID GECOS Home directory Shell +u monotone - "Monotone Netsync Server" /var/lib/monotone diff --git a/monotone.spec b/monotone.spec index ecd8c34..72e35eb 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,6 +1,6 @@ Name: monotone Version: 1.1 -Release: 52%{?dist} +Release: 53%{?dist} Summary: A free, distributed version control system # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -14,6 +14,7 @@ Source5: monotone-server-initdb Source6: monotone-server-migratedb Source7: monotone-server-genkey Source8: monotone-server-import +Source9: monotone-server-sysusers.conf Patch0: monotone-1.0-stacktrace-on-crash.patch Patch1: monotone-1.1-iostream.patch Patch2: monotone-1.1-lua-integer.patch @@ -34,6 +35,8 @@ BuildRequires: sqlite-devel >= 3.3.8 BuildRequires: lua-devel >= 5.1 BuildRequires: libidn-devel BuildRequires: systemd +BuildRequires: systemd-rpm-macros +%{?sysusers_requires_compat} # Required by the test suite: BuildRequires: cvs @@ -142,6 +145,8 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions mv %{buildroot}%{_sysconfdir}/bash_completion.d/monotone.bash_completion \ %{buildroot}%{_datadir}/bash-completion/completions/%{name}.bash_completion +install -p -D -m 0644 %{SOURCE9} %{buildroot}%{_sysusersdir}/monotone-server.conf + %files -f %{name}.lang %doc AUTHORS NEWS README UPGRADE @@ -184,15 +189,11 @@ mv %{buildroot}%{_sysconfdir}/bash_completion.d/monotone.bash_completion \ %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_sysconfdir}/monotone/write-permissions %dir %attr(0770,monotone,monotone) %{_localstatedir}/lib/monotone %attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_localstatedir}/lib/monotone/server.mtn +%{_sysusersdir}/monotone-server.conf %pre server -# Add "monotone" user per http://fedoraproject.org/wiki/Packaging/UsersAndGroups -getent group monotone > /dev/null || groupadd -r monotone -getent passwd monotone > /dev/null || -useradd -r -g monotone -r -d %{_localstatedir}/lib/monotone -s /sbin/nologin \ - -c "Monotone Netsync Server" monotone -exit 0 +%sysusers_create_compat %{SOURCE9} %post server @@ -208,6 +209,9 @@ exit 0 %changelog +* Thu Aug 28 2025 Thomas Moschny - 1.1-53 +- Update for current users and groups guidelines. + * Thu Jul 24 2025 Fedora Release Engineering - 1.1-52 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild