Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package brltty for openSUSE:Factory checked
in at 2023-06-22 23:24:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/brltty (Old)
and /work/SRC/openSUSE:Factory/.brltty.new.15902 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "brltty"
Thu Jun 22 23:24:40 2023 rev:61 rq:1094353 version:6.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/brltty/brltty.changes 2022-12-19
14:07:54.378553091 +0100
+++ /work/SRC/openSUSE:Factory/.brltty.new.15902/brltty.changes 2023-06-22
23:24:42.613702918 +0200
@@ -1,0 +2,16 @@
+Thu Jun 20 20:20:20 UTC 2023 - o...@aepfle.de
+
+- Use conditionals for sysusers_requires to allow quilt setup
+- Remove workarounds for old TCL
+- Enable parallel build again
+
+-------------------------------------------------------------------
+Tue Jun 20 15:14:57 UTC 2023 - Franck Bui <f...@suse.com>
+
+- Don't use %tmpfiles_create_package anymore.
+
+ This macro cannot work on transactional systems. However this macro was
+ supposed to be used only when the tmpfiles stuff was needed in advance, which
+ doesn't seem to be the case for brltty.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ brltty.spec ++++++
--- /var/tmp/diff_new_pack.TbuPw1/_old 2023-06-22 23:24:43.853699771 +0200
+++ /var/tmp/diff_new_pack.TbuPw1/_new 2023-06-22 23:24:43.857699760 +0200
@@ -1,7 +1,7 @@
#
# spec file for package brltty
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,6 @@
#
-%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)}
-%{!?tcl_sitearch: %global tcl_sitearch %{_libdir}/tcl/tcl%{tcl_version}}
%define api_version 0.8.4
%define sover 0_8
%define soname libbrlapi%{sover}
@@ -30,11 +28,11 @@
Group: System/Daemons
URL: https://brltty.app/
-Source0: https://brltty.app/archive/%{name}-%{version}.tar.xz
+Source0: https://brltty.app/archive/%name-%version.tar.xz
Source1: README.SUSE
Patch0: brltty-udev-dir.patch
-Requires(pre): system-user-brltty = %{version}-%{release}
+Requires(pre): system-user-brltty = %version-%release
BuildRequires: bison
BuildRequires: doxygen
@@ -79,7 +77,7 @@
%package driver-at-spi2
Summary: AT-SPI 2 driver for BRLTTY
Group: System/Daemons
-Requires: %{name} = %{version}
+Requires: %name = %version
Supplements: (brltty and at-spi2-core)
%description driver-at-spi2
@@ -93,7 +91,7 @@
%package driver-brlapi
Summary: BrlAPI driver for BRLTTY
Group: System/Daemons
-Requires: %{name} = %{version}
+Requires: %name = %version
Supplements: (brltty and %{soname})
%description driver-brlapi
@@ -107,7 +105,7 @@
%package driver-libbraille
Summary: Libbraille driver for BRLTTY
Group: System/Daemons
-Requires: %{name} = %{version}
+Requires: %name = %version
Supplements: (brltty and libbraille)
%description driver-libbraille
@@ -121,7 +119,7 @@
%package driver-espeak
Summary: ESpeak driver for BRLTTY
Group: System/Daemons
-Requires: %{name} = %{version}
+Requires: %name = %version
Supplements: (brltty and espeak-ng-compat)
%description driver-espeak
@@ -135,7 +133,7 @@
%package driver-speech-dispatcher
Summary: Speech Dispatcher driver for BRLTTY
Group: System/Daemons
-Requires: %{name} = %{version}
+Requires: %name = %version
Supplements: (brltty and libspeechd2)
%description driver-speech-dispatcher
@@ -149,7 +147,7 @@
%package driver-xwindow
Summary: XWindow driver for BRLTTY
Group: System/Daemons
-Requires: %{name} = %{version}
+Requires: %name = %version
Supplements: (brltty and xorg-x11-server)
%description driver-xwindow
@@ -163,7 +161,7 @@
%package udev-generic
Summary: BRLTTY Udev rules for braille devices that use a generic USB
to serial adapter.
Group: System/Daemons
-Requires: %{name} = %{version}-%{release}
+Requires: %name = %version-%release
%description udev-generic
This package provides additional rules for managing BRLTTY via Udev.
@@ -173,7 +171,7 @@
%package utils
Summary: Braille display driver for Linux/Unix
Group: System/Daemons
-Requires: %{name} = %{version}
+Requires: %name = %version
%description utils
BRLTTY is a background process (daemon) which provides access to the
@@ -186,7 +184,7 @@
%package -n xbrlapi
Summary: X BrlAPI helper
Group: System/Daemons
-Requires: %{name} = %{version}
+Requires: %name = %version
Supplements: (%{soname} and xorg-x11-server)
%description -n xbrlapi
@@ -199,7 +197,7 @@
#!BuildIgnore: group(brlapi)
Requires(post): group(brlapi)
Requires(post): util-linux
-Recommends: %{name}
+Recommends: %name
%description -n %{soname}
BrlAPI is a service provided by the brltty daemon.
@@ -216,7 +214,7 @@
%package -n brlapi-devel
Summary: Library to use BRLTTY from applications -- Development Files
Group: Development/Libraries/C and C++
-Requires: %{soname} = %{version}
+Requires: %{soname} = %version
%description -n brlapi-devel
BrlAPI is a service provided by the brltty daemon.
@@ -309,7 +307,7 @@
Requires(pre): group(input)
BuildArch: noarch
BuildRequires: sysuser-tools
-%sysusers_requires
+%?sysusers_requires
%description -n system-user-brltty
System user for the Braille display driver for Linux/Unix
@@ -320,42 +318,42 @@
%autosetup -p1
%build
-%sysusers_generate_pre Autostart/Systemd/sysusers system-user-brltty
%{name}.conf
-cp %{_sourcedir}/README.SUSE .
+%sysusers_generate_pre Autostart/Systemd/sysusers system-user-brltty %name.conf
+cp %_sourcedir/README.SUSE .
# Fix "wrong-file-end-of-line-encoding" rpmlint warning
sed -i 's/\r$//' Documents/Manual-BRLTTY/Portuguese/BRLTTY.txt
-modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
+modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%_sourcedir/%name.changes")"
DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
TIME="\"$(date -d "${modified}" "+%%R")\""
find . -type f -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i
"s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} +
-for i in -I%{_libdir}/jvm/java/include{,/linux}; do
+for i in -I%_libdir/jvm/java/include{,/linux}; do
java_inc="$java_inc $i"
done
export PYTHON=/usr/bin/python3
%configure CPPFLAGS="$java_inc" \
- --with-install-root="%{buildroot}" \
- --with-tables-directory=%{_datadir}/%{name} \
+ --with-install-root="%buildroot" \
+ --with-tables-directory=%_datadir/%name \
--libexecdir=%_libexecdir \
--disable-stripping
-make -j1 # not parallel build safe
+%make_build
%install
sed -i
"s=/usr/libexec/brltty-systemd-wrapper=%_libexecdir/brltty-systemd-wrapper="
Autostart/Systemd/brltty@.service
-make install install-systemd install-udev install-polkit DESTDIR="%buildroot"
-%find_lang %{name}
+%make_install install-systemd install-udev install-polkit DESTDIR="%buildroot"
+%find_lang %name
sed -i "s/#api-parameters Auth=polkit/api-parameters Auth=polkit/"
Documents/brltty.conf
-install -D -m644 Documents/brltty.conf %{buildroot}%{_sysconfdir}/brltty.conf
+install -D -m644 Documents/brltty.conf %buildroot%_sysconfdir/brltty.conf
# ghost brlapi.key
-touch %{buildroot}%{_sysconfdir}/brlapi.key
+touch %buildroot%_sysconfdir/brlapi.key
# Don't include source files in binary package
-rm -f %{buildroot}%{_libdir}/ocaml/brlapi/brlapi.{mli,cmxa}
-rm %{buildroot}%{_libdir}/libbrlapi.a
-rm %{buildroot}%{_libdir}/ocaml/brlapi/libbrlapi_stubs.a
-rm %{buildroot}/etc/X11/Xsession.d/90xbrlapi # TODO: install this somewhere?
+rm -f %buildroot%_libdir/ocaml/brlapi/brlapi.{mli,cmxa}
+rm %buildroot%_libdir/libbrlapi.a
+rm %buildroot%_libdir/ocaml/brlapi/libbrlapi_stubs.a
+rm %buildroot/etc/X11/Xsession.d/90xbrlapi # TODO: install this somewhere?
# fix missing executable bits
-test ! -x %{buildroot}%{_bindir}/brltty-config.sh
-chmod a+x %{buildroot}%{_bindir}/brltty-config.sh
+test ! -x %buildroot%_bindir/brltty-config.sh
+chmod a+x %buildroot%_bindir/brltty-config.sh
# clean up the manuals:
rm Documents/Manual-*/*/{*.mk,Makefile*,*.sgml}
mv Documents/BrlAPIref/html Documents/BrlAPIref/BrlAPIref
@@ -369,59 +367,45 @@
done
# disable xbrlapi gdm autostart, there is already orca
-rm -f %{buildroot}%{_datadir}/gdm/greeter/autostart/xbrlapi.desktop
+rm -f %buildroot%_datadir/gdm/greeter/autostart/xbrlapi.desktop
install -Dm0644 Autostart/AppStream/org.a11y.brltty.metainfo.xml \
- %{buildroot}%{_datadir}/metainfo/org.a11y.brltty.metainfo.xml
+ %buildroot%_datadir/metainfo/org.a11y.brltty.metainfo.xml
-%fdupes -s %{buildroot}%{_mandir}
-%fdupes -s %{buildroot}
-
- # fix brp-tcl wrong location for Tcl files - This was fixed in the TCL
8.6.11 package
- mkdir -p %{buildroot}%{tcl_sitearch}
-%if %{pkg_vcmp tcl < 8.6.11}
- mv %{buildroot}%{_libdir}/brlapi-%{api_version} %{buildroot}%{tcl_sitearch}/
-%else
- # this move is possibly not needed at all anymore, but to keep the old
layout, we do it
- mv %{buildroot}%{_libdir}/tcl/brlapi-%{api_version}
%{buildroot}%{tcl_sitearch}/
-%endif
+%fdupes -s %buildroot%_mandir
+%fdupes -s %buildroot
%pre -n system-user-brltty -f system-user-brltty.pre
%post -n %{soname}
-if [ ! -e %{_sysconfdir}/brlapi.key ]; then
- mcookie > %{_sysconfdir}/brlapi.key
- chgrp brlapi %{_sysconfdir}/brlapi.key
- chmod 0640 %{_sysconfdir}/brlapi.key
+if [ ! -e %_sysconfdir/brlapi.key ]; then
+ mcookie > %_sysconfdir/brlapi.key
+ chgrp brlapi %_sysconfdir/brlapi.key
+ chmod 0640 %_sysconfdir/brlapi.key
fi
/sbin/ldconfig
%postun -n %{soname} -p /sbin/ldconfig
%pre
-%if %{defined tmpfiles_create_package}
-%tmpfiles_create_package %{name} %{buildroot}%{_tmpfilesdir}/%{name}.conf
-%endif
-%service_add_pre %{name}.path
+%service_add_pre %name.path
%post
-%if ! %{defined tmpfiles_create_package}
-%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
-%endif
-%service_add_post %{name}.path
+%tmpfiles_create %_tmpfilesdir/%name.conf
+%service_add_post %name.path
# Remove any messages that could've been in place about the upgrade
-rm -f
%{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-something
+rm -f %_localstatedir/adm/update-messages/%name-%version-%release-something
if [ -f /usr/bin/lsusb ]; then
lsusb 2>/dev/null |grep -q 0403:6001
if [ $? -eq 0 ]; then
- cat >>
%{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-something
<< EOF
+ cat >>
%_localstatedir/adm/update-messages/%name-%version-%release-something << EOF
WARNING: The SUSE brltty package no longer enables certain USB
refreshable Braille displays by default, and it appears that you may have
one of these displays attached. If so, then you may need to edit
-%{_udevrulesdir}/90-brltty-device.rules.
+%_udevrulesdir/90-brltty-device.rules.
If your device is a standard USB-to-serial converter, rather than a
refreshable Braille display, then you can ignore this message.
See /usr/share/doc/packages/brltty/README.SUSE for more information.
@@ -431,130 +415,130 @@
fi
%preun
-%service_del_preun %{name}.path
+%service_del_preun %name.path
%postun
-%service_del_postun %{name}.path
+%service_del_postun %name.path
# Remove the /var/adm updatemsg that was hand-created and thus not on filelist
-rm -f
%{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-something
+rm -f %_localstatedir/adm/update-messages/%name-%version-%release-something
%files
%license LICENSE-LGPL
%doc README README.SUSE Documents/ChangeLog Documents/CONTRIBUTORS
Documents/HISTORY Documents/README.Bluetooth Documents/TODO
%doc Documents/Manual-BRLTTY/English
-%config(noreplace) %{_sysconfdir}/brltty.conf
-%{_datadir}/brltty/
-%{_bindir}/brltty
-%{_bindir}/brltty-clip
-%{_bindir}/brltty-atb
-%{_bindir}/brltty-cldr
-%{_bindir}/brltty-config.sh
-%{_bindir}/brltty-ctb
-%{_bindir}/brltty-genkey
-%{_bindir}/brltty-hid
-%{_bindir}/brltty-ktb
-%{_bindir}/brltty-lscmds
-%{_bindir}/brltty-lsinc
-%{_bindir}/brltty-mkuser
-%{_bindir}/brltty-morse
-%{_bindir}/brltty-prologue.bash
-%{_bindir}/brltty-prologue.lua
-%{_bindir}/brltty-prologue.tcl
-%{_bindir}/brltty-prologue.sh
-%{_bindir}/brltty-setcaps
-%{_bindir}/brltty-trtxt
-%{_bindir}/brltty-ttb
-%{_bindir}/brltty-ttysize
-%{_bindir}/brltty-tune
-%{_bindir}/eutp
-%dir %{_datadir}/metainfo
-%{_datadir}/metainfo/org.a11y.%{name}.metainfo.xml
-%{_datadir}/polkit-1/actions/org.a11y.brlapi.policy
-%{_datadir}/polkit-1/rules.d/org.a11y.brlapi.rules
-%{_libdir}/brltty/
-%{_libexecdir}/brltty/
-%{_mandir}/man1/brltty.1*
-%{_mandir}/man1/eutp.1.gz
-%{_tmpfilesdir}/%{name}.conf
-%{_udevrulesdir}/90-%{name}-hid.rules
-%{_udevrulesdir}/90-%{name}-uinput.rules
-%{_udevrulesdir}/90-%{name}-usb-customized.rules
-%{_unitdir}/%{name}.path
-%{_unitdir}/%{name}@.path
-%{_unitdir}/%{name}-device@.service
-%{_unitdir}/%{name}@.service
-%exclude %{_libdir}/brltty/libbrlttybba.so
-%exclude %{_libdir}/brltty/libbrlttyblb.so
-%exclude %{_libdir}/brltty/libbrlttybxw.so
-%exclude %{_libdir}/brltty/libbrlttyses.so
-%exclude %{_libdir}/brltty/libbrlttyssd.so
-%exclude %{_libdir}/brltty/libbrlttyxa2.so
-%ghost
%{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-something
+%config(noreplace) %_sysconfdir/brltty.conf
+%_datadir/brltty/
+%_bindir/brltty
+%_bindir/brltty-clip
+%_bindir/brltty-atb
+%_bindir/brltty-cldr
+%_bindir/brltty-config.sh
+%_bindir/brltty-ctb
+%_bindir/brltty-genkey
+%_bindir/brltty-hid
+%_bindir/brltty-ktb
+%_bindir/brltty-lscmds
+%_bindir/brltty-lsinc
+%_bindir/brltty-mkuser
+%_bindir/brltty-morse
+%_bindir/brltty-prologue.bash
+%_bindir/brltty-prologue.lua
+%_bindir/brltty-prologue.tcl
+%_bindir/brltty-prologue.sh
+%_bindir/brltty-setcaps
+%_bindir/brltty-trtxt
+%_bindir/brltty-ttb
+%_bindir/brltty-ttysize
+%_bindir/brltty-tune
+%_bindir/eutp
+%dir %_datadir/metainfo
+%_datadir/metainfo/org.a11y.%name.metainfo.xml
+%_datadir/polkit-1/actions/org.a11y.brlapi.policy
+%_datadir/polkit-1/rules.d/org.a11y.brlapi.rules
+%_libdir/brltty/
+%_libexecdir/brltty/
+%_mandir/man1/brltty.1*
+%_mandir/man1/eutp.1.gz
+%_tmpfilesdir/%name.conf
+%_udevrulesdir/90-%name-hid.rules
+%_udevrulesdir/90-%name-uinput.rules
+%_udevrulesdir/90-%name-usb-customized.rules
+%_unitdir/%name.path
+%_unitdir/%name@.path
+%_unitdir/%name-device@.service
+%_unitdir/%name@.service
+%exclude %_libdir/brltty/libbrlttybba.so
+%exclude %_libdir/brltty/libbrlttyblb.so
+%exclude %_libdir/brltty/libbrlttybxw.so
+%exclude %_libdir/brltty/libbrlttyses.so
+%exclude %_libdir/brltty/libbrlttyssd.so
+%exclude %_libdir/brltty/libbrlttyxa2.so
+%ghost %_localstatedir/adm/update-messages/%name-%version-%release-something
%files driver-at-spi2
-%{_libdir}/brltty/libbrlttyxa2.so
+%_libdir/brltty/libbrlttyxa2.so
%files driver-brlapi
%doc Drivers/Braille/BrlAPI/README
-%{_libdir}/brltty/libbrlttybba.so
+%_libdir/brltty/libbrlttybba.so
%files driver-libbraille
-%{_libdir}/brltty/libbrlttyblb.so
+%_libdir/brltty/libbrlttyblb.so
%files driver-espeak
%doc Drivers/Speech/eSpeak/README
-%{_libdir}/brltty/libbrlttyses.so
+%_libdir/brltty/libbrlttyses.so
%files driver-speech-dispatcher
%doc Drivers/Speech/SpeechDispatcher/README
-%{_libdir}/brltty/libbrlttyssd.so
+%_libdir/brltty/libbrlttyssd.so
%files driver-xwindow
%doc Drivers/Braille/XWindow/README
-%{_libdir}/brltty/libbrlttybxw.so
+%_libdir/brltty/libbrlttybxw.so
%files udev-generic
-%{_udevrulesdir}/90-%{name}-usb-generic.rules
+%_udevrulesdir/90-%name-usb-generic.rules
%files utils
-%{_bindir}/vstp
-%{_mandir}/man1/vstp.1*
+%_bindir/vstp
+%_mandir/man1/vstp.1*
%files -n xbrlapi
-%{_bindir}/xbrlapi
-%{_mandir}/man1/xbrlapi.1*
+%_bindir/xbrlapi
+%_mandir/man1/xbrlapi.1*
%files -n %{soname}
%doc Documents/Manual-BrlAPI/
-%{_libdir}/libbrlapi.so.*
-%ghost %{_sysconfdir}/brlapi.key
+%_libdir/libbrlapi.so.*
+%ghost %_sysconfdir/brlapi.key
%files -n brlapi-devel
-%{_includedir}/brltty/
-%{_includedir}/brlapi*.h
-%{_libdir}/libbrlapi.so
-%{_libdir}/pkgconfig/brltty.pc
-%doc %{_mandir}/man3/brlapi_*
+%_includedir/brltty/
+%_includedir/brlapi*.h
+%_libdir/libbrlapi.so
+%_libdir/pkgconfig/brltty.pc
+%doc %_mandir/man3/brlapi_*
%files -n brlapi-java
%{_jnidir}/libbrlapi_java.so
%{_javadir}/brlapi.jar
%files -n ocaml-brlapi
-%{_libdir}/ocaml/brlapi/
-%{_libdir}/ocaml/stublibs/dllbrlapi_stubs.so*
+%_libdir/ocaml/brlapi/
+%_libdir/ocaml/stublibs/dllbrlapi_stubs.so*
%files -n python3-brlapi
%{python3_sitearch}/brlapi.cpython*.so
%{python3_sitearch}/Brlapi-*.egg-info
%files -n tcl-brlapi
-%{tcl_sitearch}/brlapi-%{api_version}/
+%_libdir/tcl/brlapi-%{api_version}/
%files -n system-user-brltty
-%{_sysusersdir}/%{name}.conf
+%_sysusersdir/%name.conf
-%files lang -f %{name}.lang
+%files lang -f %name.lang
%doc Documents/Manual-BRLTTY/French
%doc Documents/Manual-BRLTTY/Portuguese
