Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package brasero for openSUSE:Factory checked in at 2022-01-26 21:26:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/brasero (Old) and /work/SRC/openSUSE:Factory/.brasero.new.1938 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "brasero" Wed Jan 26 21:26:50 2022 rev:93 rq:949123 version:3.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/brasero/brasero.changes 2021-09-29 20:17:27.906786487 +0200 +++ /work/SRC/openSUSE:Factory/.brasero.new.1938/brasero.changes 2022-01-26 21:27:17.945862250 +0100 @@ -1,0 +2,11 @@ +Wed Jan 12 20:00:15 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com> + +- Add 9b3f451e72cfa3bac700517a036faab61f683b3f.patch: + libbrasero-media: Fix duplicated if. +- Disable nautilus integration for now, does not work with gtk4 + based nautilus. Disable pkgconfig(libnautilus-extension) + BuildRequires and pass disable-nautilus to configure via bcond. +- Modernize post(un) handling and Supplements, use + ldconfig_scriptlets macro. + +------------------------------------------------------------------- New: ---- 9b3f451e72cfa3bac700517a036faab61f683b3f.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ brasero.spec ++++++ --- /var/tmp/diff_new_pack.Hf3Ru7/_old 2022-01-26 21:27:18.553858058 +0100 +++ /var/tmp/diff_new_pack.Hf3Ru7/_new 2022-01-26 21:27:18.561858003 +0100 @@ -1,7 +1,7 @@ # # spec file for package brasero # -# 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 @@ -16,6 +16,8 @@ # +%bcond_with nautilus_extension + Name: brasero Version: 3.12.3 Release: 0 @@ -24,6 +26,9 @@ Group: Productivity/Multimedia/CD/Record URL: http://gnome.org/projects/brasero Source: https://download.gnome.org/sources/brasero/3.12/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM 9b3f451e72cfa3bac700517a036faab61f683b3f.patch -- libbrasero-media: Fix duplicated if +Patch: https://gitlab.gnome.org/GNOME/brasero/-/commit/9b3f451e72cfa3bac700517a036faab61f683b3f.patch + BuildRequires: fdupes # Needed, as we provide a git snapshot BuildRequires: gnome-common @@ -49,7 +54,9 @@ BuildRequires: pkgconfig(libcanberra) BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libisofs-1) >= 0.6.4 +%if %{with nautilus_extension} BuildRequires: pkgconfig(libnautilus-extension) +%endif BuildRequires: pkgconfig(libnotify) >= 0.6.1 BuildRequires: pkgconfig(libxml-2.0) >= 2.6.0 BuildRequires: pkgconfig(sm) @@ -97,6 +104,7 @@ %description devel Brasero is an application for the GNOME Desktop to write CD/DVDs. +This package contains the development files. %package -n libbrasero-burn3-1 Summary: Brasero composition utility function library @@ -153,18 +161,20 @@ that did not fit in the other two categories (brasero-burn, brasero-media). +%if %{with nautilus_extension} %package nautilus Summary: Brasero CD/DVD burning extension for Nautilus Group: Productivity/Multimedia/CD/Record -Supplements: packageand(brasero:nautilus) +Supplements: (brasero and nautilus) %description nautilus This package provides the Brasero extension for Nautilus. +%endif %lang_package %prep -%setup -q +%autosetup -p1 %build %configure \ @@ -172,10 +182,14 @@ --disable-gtk-doc \ --enable-search \ --enable-playlist \ +%if %{with nautilus_extension} --enable-nautilus \ +%else + --disable-nautilus \ +%endif --enable-introspection \ --enable-libburnia -make %{?_smp_mflags} V=1 +%make_build %install %make_install @@ -184,37 +198,16 @@ %endif find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file %{name} +%if %{with nautilus_extension} %suse_update_desktop_file brasero-nautilus +%endif %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot}/%{_prefix} -%post -/sbin/ldconfig -%glib2_gsettings_schema_post -%desktop_database_post -%icon_theme_cache_post -%mime_database_post - -%post -n libbrasero-burn3-1 -p /sbin/ldconfig -%post -n libbrasero-media3-1 -p /sbin/ldconfig -%post -n libbrasero-utils3-1 -p /sbin/ldconfig - -%post nautilus -%desktop_database_post - -%postun -/sbin/ldconfig -%glib2_gsettings_schema_postun -%desktop_database_postun -%icon_theme_cache_postun -%mime_database_postun - -%postun -n libbrasero-burn3-1 -p /sbin/ldconfig -%postun -n libbrasero-media3-1 -p /sbin/ldconfig -%postun -n libbrasero-utils3-1 -p /sbin/ldconfig - -%postun nautilus -%desktop_database_postun +%ldconfig_scriptlets +%ldconfig_scriptlets -n libbrasero-burn3-1 +%ldconfig_scriptlets -n libbrasero-media3-1 +%ldconfig_scriptlets -n libbrasero-utils3-1 %files %license COPYING @@ -227,6 +220,8 @@ %{_datadir}/applications/brasero.desktop %{_datadir}/icons/hicolor/*/apps/brasero*.* %{_datadir}/mime/packages/brasero.xml +%dir %{_datadir}/GConf +%dir %{_datadir}/GConf/gsettings %{_datadir}/GConf/gsettings/brasero.convert %{_datadir}/glib-2.0/schemas/org.gnome.brasero.gschema.xml %{_mandir}/man?/*%{ext_man} @@ -257,9 +252,11 @@ %{_datadir}/gir-1.0/BraseroBurn-*.gir %{_datadir}/gir-1.0/BraseroMedia-*.gir +%if %{with nautilus_extension} %files nautilus %{_libdir}/nautilus/extensions-3.0/*.so %{_datadir}/applications/brasero-nautilus.desktop +%endif %files lang -f %{name}.lang ++++++ 9b3f451e72cfa3bac700517a036faab61f683b3f.patch ++++++ >From 9b3f451e72cfa3bac700517a036faab61f683b3f Mon Sep 17 00:00:00 2001 From: David King <amigad...@amigadave.com> Date: Tue, 2 Nov 2021 11:38:11 +0000 Subject: [PATCH] libbrasero-media: Fix duplicated if https://gitlab.gnome.org/GNOME/brasero/-/issues/358 --- libbrasero-media/scsi-read-track-information.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libbrasero-media/scsi-read-track-information.c b/libbrasero-media/scsi-read-track-information.c index 6f6274ad..e8d44c63 100644 --- a/libbrasero-media/scsi-read-track-information.c +++ b/libbrasero-media/scsi-read-track-information.c @@ -132,7 +132,7 @@ brasero_read_track_info (BraseroRdTrackInfoCDB *cdb, else *size = datasize; } - else if (*size < datasize) { + else if (datasize < *size) { BRASERO_MEDIA_LOG ("Oversized data required (%i) setting to %i", *size, datasize); *size = datasize; } -- GitLab
