Compare commits

...

No commits in common. "c8" and "c10s" have entirely different histories.
c8 ... c10s

9 changed files with 289 additions and 119 deletions

View File

@ -1 +0,0 @@
72f2ba2f03ae31992c769537bd939cfea4327000 SOURCES/baobab-3.28.0.tar.xz

81
.gitignore vendored
View File

@ -1 +1,80 @@
SOURCES/baobab-3.28.0.tar.xz
/baobab-3.3.2.tar.xz
/baobab-3.3.3.tar.xz
/baobab-3.3.4.tar.xz
/baobab-3.4.0.tar.xz
/baobab-3.4.1.tar.xz
/baobab-3.5.3.tar.xz
/baobab-3.5.5.tar.xz
/baobab-3.5.90.tar.xz
/baobab-3.5.91.tar.xz
/baobab-3.5.92.tar.xz
/baobab-3.6.0.tar.xz
/baobab-3.6.1.tar.xz
/baobab-3.6.2.tar.xz
/baobab-3.6.3.tar.xz
/baobab-3.7.4.tar.xz
/baobab-3.7.90.tar.xz
/baobab-3.7.91.tar.xz
/baobab-3.7.92.tar.xz
/baobab-3.8.0.tar.xz
/baobab-3.8.1.tar.xz
/baobab-3.8.2.tar.xz
/baobab-3.9.1.tar.xz
/baobab-3.9.3.tar.xz
/baobab-3.9.90.tar.xz
/baobab-3.9.91.tar.xz
/baobab-3.10.tar.xz
/baobab-3.10.1.tar.xz
/baobab-3.11.1.tar.xz
/baobab-3.11.90.tar.xz
/baobab-3.12.0.tar.xz
/baobab-3.12.1.tar.xz
/baobab-3.13.1.tar.xz
/baobab-3.13.2.tar.xz
/baobab-3.13.91.tar.xz
/baobab-3.14.0.tar.xz
/baobab-3.14.1.tar.xz
/baobab-3.15.90.tar.xz
/baobab-3.16.0.tar.xz
/baobab-3.16.1.tar.xz
/baobab-3.17.90.tar.xz
/baobab-3.18.0.tar.xz
/baobab-3.18.1.tar.xz
/baobab-3.19.91.tar.xz
/baobab-3.20.0.tar.xz
/baobab-3.20.1.tar.xz
/baobab-3.21.90.tar.xz
/baobab-3.21.92.tar.xz
/baobab-3.22.0.tar.xz
/baobab-3.22.1.tar.xz
/baobab-3.23.90.tar.xz
/baobab-3.23.91.tar.xz
/baobab-3.24.0.tar.xz
/baobab-3.25.92.tar.xz
/baobab-3.26.0.tar.xz
/baobab-3.26.1.tar.xz
/baobab-3.27.90.tar.xz
/baobab-3.28.0.tar.xz
/baobab-3.30.0.tar.xz
/baobab-3.31.1.tar.xz
/baobab-3.32.0.tar.xz
/baobab-3.34.0.tar.xz
/baobab-3.37.90.tar.xz
/baobab-3.38.0.tar.xz
/baobab-40.beta.tar.xz
/baobab-40.0.tar.xz
/baobab-41.0.tar.xz
/baobab-42.alpha.tar.xz
/baobab-42.beta.tar.xz
/baobab-42.rc.tar.xz
/baobab-42.0.tar.xz
/baobab-43.alpha.tar.xz
/baobab-43.beta.tar.xz
/baobab-43.rc.tar.xz
/baobab-43.0.tar.xz
/baobab-44.beta.tar.xz
/baobab-44.rc.tar.xz
/baobab-44.0.tar.xz
/baobab-45.alpha.tar.xz
/baobab-45.0.tar.xz
/baobab-46.0.tar.xz

View File

@ -0,0 +1,58 @@
From a3b597b7a2f02b4ba7466bfa1ea4a306a883728f Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Thu, 13 Jun 2024 11:50:30 +0200
Subject: [PATCH] Disable column reordering of FolderDisplay
Currently, it is possible to reorder columns of the `BaobabFolderDisplay`
widget using drag and drop. However, there are some issues with this
feature. The new column order is applied only to the first row and not to
the others that are part of the separate `treeview` widget. Another
problem is that dragging the "Folder" column sometimes significantly
increases the window width. Let's disable the column reordering until
those issues are resolved.
Related: https://issues.redhat.com/browse/RHEL-40874
Related: https://issues.redhat.com/browse/RHEL-40875
---
data/ui/baobab-folder-display.ui | 4 ----
1 file changed, 4 deletions(-)
diff --git a/data/ui/baobab-folder-display.ui b/data/ui/baobab-folder-display.ui
index 7e585c7..6466b18 100644
--- a/data/ui/baobab-folder-display.ui
+++ b/data/ui/baobab-folder-display.ui
@@ -13,7 +13,6 @@
<object class="GtkTreeViewColumn" id="folder_column">
<property name="title" translatable="yes">Folder</property>
<property name="expand">True</property>
- <property name="reorderable">True</property>
<property name="sort_column_id">0</property>
<child>
<object class="GtkCellRendererPixbuf" id="folder_column_icon_renderer">
@@ -35,7 +34,6 @@
<child>
<object class="GtkTreeViewColumn" id="size_column">
<property name="title" translatable="yes">Size</property>
- <property name="reorderable">True</property>
<property name="sort_column_id">2</property>
<child>
<object class="BaobabCellRendererSize" id="size_column_size_renderer">
@@ -51,7 +49,6 @@
<child>
<object class="GtkTreeViewColumn" id="contents_column">
<property name="title" translatable="yes">Contents</property>
- <property name="reorderable">True</property>
<property name="sort_column_id">5</property>
<child>
<object class="BaobabCellRendererItems" id="contents_column_items_renderer">
@@ -67,7 +64,6 @@
<child>
<object class="GtkTreeViewColumn" id="time_modified_column">
<property name="title" translatable="yes">Modified</property>
- <property name="reorderable">True</property>
<property name="sort_column_id">3</property>
<child>
<object class="BaobabCellRendererTime" id="modified_column_time_renderer">
--
2.45.1

View File

@ -1,63 +0,0 @@
From 80f7e1c144103d52a877f2d42db6a427867591f6 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
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<61>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

View File

@ -1,13 +0,0 @@
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,

View File

@ -1,14 +0,0 @@
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."),

View File

@ -1,21 +1,25 @@
%global gtk3_version 3.19.1
%global gtk4_version 4.4.0
%global libadwaita_version 1.4~alpha
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: baobab
Version: 3.28.0
Version: 46.0
Release: 4%{?dist}
Summary: A graphical directory tree analyzer
License: GPLv2+ and GFDL
# Sources are under GPL-2.0-or-later, help is under CC-BY-SA-3.0, Appdata is
# under CC0-1.0.
License: GPL-2.0-or-later AND CC-BY-SA-3.0 AND CC0-1.0
URL: https://wiki.gnome.org/Apps/Baobab
Source0: https://download.gnome.org/sources/baobab/3.28/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/baobab/46/%{name}-%{tarball_version}.tar.xz
Patch0: build-Fix-gschema-translations.patch
# https://issues.redhat.com/browse/RHEL-40874
# https://issues.redhat.com/browse/RHEL-40875
Patch: Disable-column-reordering-of-FolderDisplay.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: pkgconfig(gtk4) >= %{gtk4_version}
BuildRequires: pkgconfig(libadwaita-1) >= %{libadwaita_version}
BuildRequires: /usr/bin/appstream-util
BuildRequires: desktop-file-utils
BuildRequires: gettext
@ -23,11 +27,8 @@ BuildRequires: itstool
BuildRequires: meson
BuildRequires: vala
Requires: gtk3%{?_isa} >= %{gtk3_version}
Obsoletes: gnome-utils < 1:3.3
Obsoletes: gnome-utils-devel < 1:3.3
Obsoletes: gnome-utils-libs < 1:3.3
Requires: gtk4%{?_isa} >= %{libadwaita_version}
Requires: libadwaita%{?_isa} >= %{libadwaita_version}
%description
Baobab is able to scan either specific directories or the whole filesystem, in
@ -36,7 +37,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
%autosetup -p1
%autosetup -p1 -n %{name}-%{tarball_version}
%build
@ -51,32 +52,148 @@ any change made to your home folder as far as any mounted/unmounted device.
%check
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/org.gnome.baobab.appdata.xml
appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.gnome.baobab.appdata.xml
desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.baobab.desktop
%files -f %{name}.lang
%doc AUTHORS NEWS README
%doc AUTHORS NEWS README.md
%license COPYING COPYING.docs
%{_bindir}/baobab
%{_datadir}/applications/org.gnome.baobab.desktop
%{_datadir}/dbus-1/services/org.gnome.baobab.service
%{_datadir}/icons/hicolor/*/apps/baobab.png
%{_datadir}/icons/hicolor/symbolic/apps/baobab-symbolic.svg
%{_datadir}/icons/hicolor/scalable/apps/org.gnome.baobab*.svg
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.baobab-symbolic.svg
%{_datadir}/glib-2.0/schemas/org.gnome.baobab.gschema.xml
%{_datadir}/metainfo/org.gnome.baobab.appdata.xml
%{_metainfodir}/org.gnome.baobab.appdata.xml
%{_mandir}/man1/baobab.1*
%changelog
* Tue Oct 15 2019 Ondrej Holy <oholy@redhat.com> - 3.28.0-4
- Rebuild to ensure correct dist tag (rhbz#1725154)
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 46.0-4
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Oct 14 2019 Ondrej Holy <oholy@redhat.com> - 3.28.0-3
- Add website link and update application name in About dialog (rhbz#1725154)
* Wed Jun 26 2024 Ondrej Holy <oholy@redhat.com> - 46.0-3
- Disable column reordering of FolderDisplay (RHEL-40874, RHEL-40875)
* Tue Jul 9 2019 Ondrej Holy <oholy@redhat.com> - 3.28.0-2
- Fix gschema translations (rhbz#1705583)
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 46.0-2
- Bump release for June 2024 mass rebuild
* Fri Mar 22 2024 David King <amigadave@amigadave.com> - 46.0-1
- Update to 46.0
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 45.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 45.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Sep 20 2023 Kalev Lember <klember@redhat.com> - 45.0-1
- Update to 45.0
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 45~alpha-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jul 04 2023 Kalev Lember <klember@redhat.com> - 45~alpha-1
- Update to 45.alpha
* Sun Mar 19 2023 David King <amigadave@amigadave.com> - 44.0-1
- Update to 44.0
* Mon Mar 06 2023 David King <amigadave@amigadave.com> - 44~rc-1
- Update to 44.rc
* Wed Feb 15 2023 David King <amigadave@amigadave.com> - 44~beta-1
- Update to 44.beta
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 43.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Sep 20 2022 Kalev Lember <klember@redhat.com> - 43.0-1
- Update to 43.0
* Tue Sep 06 2022 Kalev Lember <klember@redhat.com> - 43~rc-1
- Update to 43.rc
* Mon Aug 08 2022 Kalev Lember <klember@redhat.com> - 43~beta-1
- Update to 43.beta
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 43~alpha-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jul 18 2022 Kalev Lember <klember@redhat.com> - 43~alpha-2
- Bump required libadwaita version
* Mon Jul 18 2022 Kalev Lember <klember@redhat.com> - 43~alpha-1
- Update to 43.alpha
* Mon Mar 21 2022 David King <amigadave@amigadave.com> - 42.0-1
- Update to 42.0
* Tue Mar 08 2022 David King <amigadave@amigadave.com> - 42~rc-1
- Update to 42.rc
* Wed Feb 16 2022 David King <amigadave@amigadave.com> - 42~beta-1
- Update to 42.beta
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 42~alpha-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jan 12 2022 David King <amigadave@amigadave.com> - 42~alpha-1
- Update to 42.alpha
* Tue Sep 21 2021 Kalev Lember <klember@redhat.com> - 41.0-1
- Update to 41.0
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 40.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon Mar 22 2021 Kalev Lember <klember@redhat.com> - 40.0-1
- Update to 40.0
- Drop old obsoletes
* Thu Feb 18 2021 Kalev Lember <klember@redhat.com> - 40~beta-1
- Update to 40.beta
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sat Sep 12 2020 Kalev Lember <klember@redhat.com> - 3.38.0-1
- Update to 3.38.0
* Mon Aug 17 2020 Kalev Lember <klember@redhat.com> - 3.37.90-1
- Update to 3.37.90
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.34.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.34.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Sep 09 2019 Kalev Lember <klember@redhat.com> - 3.34.0-1
- Update to 3.34.0
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.32.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Mar 11 2019 Kalev Lember <klember@redhat.com> - 3.32.0-1
- Update to 3.32.0
* Fri Feb 01 2019 Kalev Lember <klember@redhat.com> - 3.31.1-1
- Update to 3.31.1
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.30.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 3.30.0-1
- Update to 3.30.0
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Jun 1 2018 Ondrej Holy <oholy@redhat.com> - 3.28.0-2
- Fix setting GNOMELOCALEDIR
* Mon Mar 12 2018 Kalev Lember <klember@redhat.com> - 3.28.0-1
- Update to 3.28.0

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (baobab-46.0.tar.xz) = a09e8d47f82c4a193ea941dfc0064e33e019599d10172034a591a19047073235a602c1d5f2fda6303aa5e4524bd5a071faaf40ba447f74c5ab9bde5cb2cdeb49