Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package brltty for openSUSE:Factory checked
in at 2022-12-19 14:07:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/brltty (Old)
and /work/SRC/openSUSE:Factory/.brltty.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "brltty"
Mon Dec 19 14:07:53 2022 rev:60 rq:1043600 version:6.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/brltty/brltty.changes 2022-06-21
17:15:18.598339412 +0200
+++ /work/SRC/openSUSE:Factory/.brltty.new.1835/brltty.changes 2022-12-19
14:07:54.378553091 +0100
@@ -1,0 +2,6 @@
+Sat Dec 17 09:09:09 UTC 2022 - o...@aepfle.de
+
+- Use tmpfiles_create_package
+- Use sysuser-tools unconditionally (bsc#1205161)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ brltty.spec ++++++
--- /var/tmp/diff_new_pack.iZOsOg/_old 2022-12-19 14:07:54.926555930 +0100
+++ /var/tmp/diff_new_pack.iZOsOg/_new 2022-12-19 14:07:54.930555950 +0100
@@ -21,9 +21,6 @@
%define api_version 0.8.4
%define sover 0_8
%define soname libbrlapi%{sover}
-%if 0%{?suse_version} >= 1550
-%define with_sysusersd 1
-%endif
Name: brltty
Version: 6.5
Release: 0
@@ -37,6 +34,8 @@
Source1: README.SUSE
Patch0: brltty-udev-dir.patch
+Requires(pre): system-user-brltty = %{version}-%{release}
+
BuildRequires: bison
BuildRequires: doxygen
BuildRequires: espeak-ng-compat-devel
@@ -69,9 +68,6 @@
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xaw7)
BuildRequires: pkgconfig(xt)
-%if 0%{?with_sysusersd}
-BuildRequires: sysuser-tools
-%endif
%{?systemd_ordering}
%description
@@ -200,10 +196,8 @@
Summary: Library to use BRLTTY from applications
Group: System/Daemons
Requires(post): coreutils
-%if 0%{?with_sysusersd}
#!BuildIgnore: group(brlapi)
-Requires(pre): group(brlapi)
-%endif
+Requires(post): group(brlapi)
Requires(post): util-linux
Recommends: %{name}
@@ -304,9 +298,8 @@
ignored, whereas each piece of data coming from the braille terminal is
sent to the application, rather than to brltty.
-%if 0%{?with_sysusersd}
%package -n system-user-brltty
-Summary: System user for brltty
+Summary: System user and group named brltty
Group: System/Base
Requires(pre): group(pulse-access)
Requires(pre): group(root)
@@ -315,11 +308,11 @@
Requires(pre): group(audio)
Requires(pre): group(input)
BuildArch: noarch
+BuildRequires: sysuser-tools
%sysusers_requires
%description -n system-user-brltty
System user for the Braille display driver for Linux/Unix
-%endif
%lang_package
@@ -327,9 +320,7 @@
%autosetup -p1
%build
-%if 0%{?with_sysusersd}
%sysusers_generate_pre Autostart/Systemd/sysusers system-user-brltty
%{name}.conf
-%endif
cp %{_sourcedir}/README.SUSE .
# Fix "wrong-file-end-of-line-encoding" rpmlint warning
sed -i 's/\r$//' Documents/Manual-BRLTTY/Portuguese/BRLTTY.txt
@@ -395,14 +386,9 @@
mv %{buildroot}%{_libdir}/tcl/brlapi-%{api_version}
%{buildroot}%{tcl_sitearch}/
%endif
-%if 0%{?with_sysusersd}
%pre -n system-user-brltty -f system-user-brltty.pre
-%endif
%post -n %{soname}
-%if !0%{?with_sysusersd}
-getent group brlapi >/dev/null || groupadd -r brlapi >/dev/null
-%endif
if [ ! -e %{_sysconfdir}/brlapi.key ]; then
mcookie > %{_sysconfdir}/brlapi.key
chgrp brlapi %{_sysconfdir}/brlapi.key
@@ -413,12 +399,15 @@
%postun -n %{soname} -p /sbin/ldconfig
%pre
-%service_add_pre %{name}.path
-%if !0%{?with_sysusersd}
-getent passwd brltty >/dev/null || useradd -r -d %{_localstatedir}/lib/brltty
-s /bin/false -c "user account for the brltty daemon" brltty
+%if %{defined tmpfiles_create_package}
+%tmpfiles_create_package %{name} %{buildroot}%{_tmpfilesdir}/%{name}.conf
%endif
+%service_add_pre %{name}.path
%post
+%if ! %{defined tmpfiles_create_package}
+%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
+%endif
%service_add_post %{name}.path
# Remove any messages that could've been in place about the upgrade
@@ -494,9 +483,6 @@
%{_unitdir}/%{name}@.path
%{_unitdir}/%{name}-device@.service
%{_unitdir}/%{name}@.service
-%if !0%{?with_sysusersd}
-%{_sysusersdir}/%{name}.conf
-%endif
%exclude %{_libdir}/brltty/libbrlttybba.so
%exclude %{_libdir}/brltty/libbrlttyblb.so
%exclude %{_libdir}/brltty/libbrlttybxw.so
@@ -565,10 +551,8 @@
%files -n tcl-brlapi
%{tcl_sitearch}/brlapi-%{api_version}/
-%if 0%{?with_sysusersd}
%files -n system-user-brltty
%{_sysusersdir}/%{name}.conf
-%endif
%files lang -f %{name}.lang
%doc Documents/Manual-BRLTTY/French
