Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gerbera for openSUSE:Factory checked in at 2022-01-14 23:13:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gerbera (Old) and /work/SRC/openSUSE:Factory/.gerbera.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gerbera" Fri Jan 14 23:13:15 2022 rev:5 rq:946338 version:1.9.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gerbera/gerbera.changes 2021-10-08 00:07:11.701869738 +0200 +++ /work/SRC/openSUSE:Factory/.gerbera.new.1892/gerbera.changes 2022-01-14 23:14:42.390688490 +0100 @@ -1,0 +2,6 @@ +Fri Jan 14 06:44:40 UTC 2022 - Paolo Stivanin <[email protected]> + +- Use %sysusers_create_package on Tumbleweed +- Add fix_for_smt_gt8.patch + +------------------------------------------------------------------- New: ---- fix_for_smt_gt8.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gerbera.spec ++++++ --- /var/tmp/diff_new_pack.HrKTE6/_old 2022-01-14 23:14:42.786688745 +0100 +++ /var/tmp/diff_new_pack.HrKTE6/_new 2022-01-14 23:14:42.790688748 +0100 @@ -1,7 +1,7 @@ # # spec file for package gerbera # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,15 +27,12 @@ Source1: config.xml Source2: gerbera.sysusers.in Patch0: harden_gerbera.service.patch +# PATCH-FIX-UPSTREAM: this will be included with v1.9.3 +Patch1: fix_for_smt_gt8.patch +BuildRequires: ccache BuildRequires: cmake >= 3.13 BuildRequires: fdupes BuildRequires: file-devel -%if 0%{?suse_version} <= 1550 -BuildRequires: gcc10-c++ -%else -BuildRequires: gcc-c++ -%endif -BuildRequires: ccache BuildRequires: hicolor-icon-theme BuildRequires: pkgconfig BuildRequires: pkgconfig(duktape) @@ -60,7 +57,13 @@ BuildRequires: pkgconfig(taglib) >= 1.11 BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(zlib) +Requires: logrotate %{?systemd_requires} +%if 0%{?suse_version} <= 1550 +BuildRequires: gcc10-c++ +%else +BuildRequires: gcc-c++ +%endif %description Gerbera is a UPnP media server which allows streaming digital @@ -103,7 +106,7 @@ touch %{buildroot}%{_localstatedir}/log/%{name} mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d cat > %{buildroot}%{_sysconfdir}/logrotate.d/%{name} << 'EOF' -/var/log/gerbera/gerbera { +%{_localstatedir}/log/gerbera/gerbera { create 644 gerbera gerbera monthly compress @@ -129,7 +132,11 @@ %post %service_add_post %{name}.service +%if 0%{?suse_version} > 1590 +%sysusers_create_package %{_sysusersdir}/%{name}.conf +%else %sysusers_create %{_sysusersdir}/%{name}.conf +%endif %preun %service_del_preun %{name}.service ++++++ fix_for_smt_gt8.patch ++++++ >From f25950e8ac23a8e6859bf5861884b8818ead2db8 Mon Sep 17 00:00:00 2001 From: kyak <[email protected]> Date: Wed, 12 Jan 2022 19:41:37 +0300 Subject: [PATCH] Fix for fmt > 8.0 --- src/util/logger.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/util/logger.h b/src/util/logger.h index 58696e52f..ba64afa79 100644 --- a/src/util/logger.h +++ b/src/util/logger.h @@ -32,7 +32,9 @@ #ifndef __LOGGER_H__ #define __LOGGER_H__ +#include <fmt/format.h> #include <spdlog/spdlog.h> +#include <type_traits> #define log_debug SPDLOG_DEBUG #define log_info SPDLOG_INFO @@ -40,4 +42,17 @@ #define log_error SPDLOG_ERROR #define log_js SPDLOG_INFO +#if FMT_VERSION >= 80100 +template <typename T> +struct fmt::formatter<T, std::enable_if_t<std::is_enum_v<T>, char>> + : formatter<std::underlying_type_t<T>> { + template <typename FormatContext> + auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) + { + return fmt::formatter<std::underlying_type_t<T>>::format( + static_cast<std::underlying_type_t<T>>(value), ctx); + } +}; +#endif + #endif // __LOGGER_H__ ++++++ harden_gerbera.service.patch ++++++ --- /var/tmp/diff_new_pack.HrKTE6/_old 2022-01-14 23:14:42.842688781 +0100 +++ /var/tmp/diff_new_pack.HrKTE6/_new 2022-01-14 23:14:42.846688784 +0100 @@ -18,7 +18,7 @@ +ProtectKernelLogs=true +ProtectControlGroups=true +RestrictRealtime=true -+ReadWritePaths=/usr/share/gerbera/ /etc/gerbera/ ++ReadWritePaths=/usr/share/gerbera/ /etc/gerbera/ /var/log/gerbera +# end of automatic additions Type=simple User=gerbera
