From 00ae69affec3b1e7272f2dc6f40ac337f64a27cd Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 21 2020 21:33:11 +0000 Subject: import baobab-3.28.0-4.el8 --- diff --git a/SOURCES/build-Fix-gschema-translations.patch b/SOURCES/build-Fix-gschema-translations.patch new file mode 100644 index 0000000..5bac5ee --- /dev/null +++ b/SOURCES/build-Fix-gschema-translations.patch @@ -0,0 +1,63 @@ +From 80f7e1c144103d52a877f2d42db6a427867591f6 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Thu, 14 Jun 2018 15:22:15 +0200 +Subject: [PATCH] build: Fix gschema translations +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +After meson port, translations are merged in gschema file, which doesn't +work: + +$ LANG=en_US gsettings describe org.gnome.baobab.preferences excluded-uris +Una lista d'URI t'as particiones que cal excluir de l'anal�s. + +Translations should not be merged in gschema files and also I don't see any +other gschema file with merged translations in /usr/share/glib-2.0/schemas/. +Let's install gschema file as is. After this change, translations works as +expected. +--- + data/meson.build | 7 ++----- + ....baobab.gschema.xml.in => org.gnome.baobab.gschema.xml} | 0 + po/POTFILES.in | 2 +- + 3 files changed, 3 insertions(+), 6 deletions(-) + rename data/{org.gnome.baobab.gschema.xml.in => org.gnome.baobab.gschema.xml} (100%) + +diff --git a/data/meson.build b/data/meson.build +index 5b1ef00..98d1d69 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -22,11 +22,8 @@ appdata_file = i18n.merge_file( + install_dir: join_paths(get_option('datadir'), 'metainfo'), + ) + +-gschema_file = i18n.merge_file( +- input: 'org.gnome.baobab.gschema.xml.in', +- output: 'org.gnome.baobab.gschema.xml', +- po_dir: '../po', +- install: true, ++install_data ( ++ 'org.gnome.baobab.gschema.xml', + install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas') + ) + +diff --git a/data/org.gnome.baobab.gschema.xml.in b/data/org.gnome.baobab.gschema.xml +similarity index 100% +rename from data/org.gnome.baobab.gschema.xml.in +rename to data/org.gnome.baobab.gschema.xml +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 0c9452a..f3d6521 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -2,7 +2,7 @@ + # Please keep this file sorted alphabetically. + data/org.gnome.baobab.appdata.xml.in + data/org.gnome.baobab.desktop.in +-data/org.gnome.baobab.gschema.xml.in ++data/org.gnome.baobab.gschema.xml + src/baobab-application.vala + src/baobab-cellrenderers.vala + src/baobab-location-list.ui +-- +2.21.0 + diff --git a/SOURCES/window-Add-website-link-to-About-dialog.patch b/SOURCES/window-Add-website-link-to-About-dialog.patch new file mode 100644 index 0000000..5792256 --- /dev/null +++ b/SOURCES/window-Add-website-link-to-About-dialog.patch @@ -0,0 +1,13 @@ +diff --git a/src/baobab-window.vala b/src/baobab-window.vala +index c91bf46..8dc0c94 100644 +--- a/src/baobab-window.vala ++++ b/src/baobab-window.vala +@@ -311,6 +311,7 @@ namespace Baobab { + "logo-icon-name", "baobab", + "version", Config.VERSION, + "comments", _("A graphical tool to analyze disk usage."), ++ "website", "https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer", + "copyright", copyright, + "license-type", Gtk.License.GPL_2_0, + "wrap-license", false, + diff --git a/SOURCES/window-Use-Disk-Usage-Analyzer-name-in-About-dialog.patch b/SOURCES/window-Use-Disk-Usage-Analyzer-name-in-About-dialog.patch new file mode 100644 index 0000000..7e0eaf9 --- /dev/null +++ b/SOURCES/window-Use-Disk-Usage-Analyzer-name-in-About-dialog.patch @@ -0,0 +1,14 @@ +diff --git a/src/baobab-window.vala b/src/baobab-window.vala +index 8dc0c94..c021646 100644 +--- a/src/baobab-window.vala ++++ b/src/baobab-window.vala +@@ -307,7 +307,7 @@ namespace Baobab { + "Copyright \xc2\xa9 2011-2012 Ryan Lortie, Paolo Borelli, Stefano Facchini\n"; + + Gtk.show_about_dialog (this, +- "program-name", _("Baobab"), ++ "program-name", _("Disk Usage Analyzer"), + "logo-icon-name", "baobab", + "version", Config.VERSION, + "comments", _("A graphical tool to analyze disk usage."), + diff --git a/SPECS/baobab.spec b/SPECS/baobab.spec index 05f8c16..ded9aff 100644 --- a/SPECS/baobab.spec +++ b/SPECS/baobab.spec @@ -2,13 +2,19 @@ Name: baobab Version: 3.28.0 -Release: 1%{?dist} +Release: 4%{?dist} Summary: A graphical directory tree analyzer License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Baobab Source0: https://download.gnome.org/sources/baobab/3.28/%{name}-%{version}.tar.xz +Patch0: build-Fix-gschema-translations.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=1725154 +Patch1: window-Use-Disk-Usage-Analyzer-name-in-About-dialog.patch +Patch2: window-Add-website-link-to-About-dialog.patch + BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} BuildRequires: /usr/bin/appstream-util BuildRequires: desktop-file-utils @@ -30,7 +36,7 @@ directory size or percentage in the branch. It also auto-detects in real-time any change made to your home folder as far as any mounted/unmounted device. %prep -%setup -q +%autosetup -p1 %build @@ -63,6 +69,15 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.baobab.des %changelog +* Tue Oct 15 2019 Ondrej Holy - 3.28.0-4 +- Rebuild to ensure correct dist tag (rhbz#1725154) + +* Mon Oct 14 2019 Ondrej Holy - 3.28.0-3 +- Add website link and update application name in About dialog (rhbz#1725154) + +* Tue Jul 9 2019 Ondrej Holy - 3.28.0-2 +- Fix gschema translations (rhbz#1705583) + * Mon Mar 12 2018 Kalev Lember - 3.28.0-1 - Update to 3.28.0