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 8a9f3b2..72e35eb 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,8 +1,9 @@ Name: monotone Version: 1.1 -Release: 37%{?dist} +Release: 53%{?dist} Summary: A free, distributed version control system -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://monotone.ca/ Source0: http://monotone.ca/downloads/%{version}/%{name}-%{version}.tar.bz2 Source1: monotone.service @@ -13,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 @@ -33,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 @@ -69,7 +73,6 @@ This package provides an easy-to-use standalone server setup for monotone. %package -n perl-Monotone Summary: Perl Module for monotone Requires: monotone = %{version}-%{release} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -n perl-Monotone @@ -138,6 +141,13 @@ install -m 0644 -p %{SOURCE3} . install -D -m 0644 -p contrib/Monotone.pm \ %{buildroot}%{perl_vendorlib}/Monotone.pm +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 %doc _doc/* @@ -146,7 +156,9 @@ install -D -m 0644 -p contrib/Monotone.pm \ %{_bindir}/mtnopt %{_bindir}/mtn-cleanup %{_infodir}/monotone.info* -%{_sysconfdir}/bash_completion.d/monotone.bash_completion +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/%{name}.bash_completion %{_mandir}/man1/mtn.1* %{_mandir}/man1/mtnopt.1* %{_mandir}/man1/mtn-cleanup.1* @@ -177,15 +189,11 @@ install -D -m 0644 -p contrib/Monotone.pm \ %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 @@ -201,6 +209,54 @@ 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 + +* Fri Jan 17 2025 Fedora Release Engineering - 1.1-51 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 26 2024 Miroslav Suchý - 1.1-50 +- convert license to SPDX + +* Thu Jul 18 2024 Fedora Release Engineering - 1.1-49 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.1-48 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.1-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1.1-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.1-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1.1-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon May 30 2022 Jitka Plesnikova - 1.1-43 +- Perl 5.36 rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.1-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.1-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri May 21 2021 Jitka Plesnikova - 1.1-40 +- Perl 5.34 rebuild + +* Mon Feb 8 2021 Thomas Moschny - 1.1-39 +- Move bash completions to /usr/share/bash-completion/completions (bz#1855768). + +* Tue Jan 26 2021 Fedora Release Engineering - 1.1-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 1.1-37 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild