Compare commits

...

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

8 changed files with 133 additions and 119 deletions

View File

@ -1 +1 @@
72f2ba2f03ae31992c769537bd939cfea4327000 SOURCES/baobab-3.28.0.tar.xz a8469469fb0236b62edd007a57ff4152ffeecd4e baobab-40.0.tar.xz

66
.gitignore vendored
View File

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

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,16 @@
%global gtk3_version 3.19.1 %global tarball_version %%(echo %{version} | tr '~' '.')
Name: baobab Name: baobab
Version: 3.28.0 Version: 40.0
Release: 4%{?dist} Release: 3%{?dist}
Summary: A graphical directory tree analyzer Summary: A graphical directory tree analyzer
License: GPLv2+ and GFDL License: GPLv2+ and GFDL
URL: https://wiki.gnome.org/Apps/Baobab 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/40/%{name}-%{tarball_version}.tar.xz
Patch0: build-Fix-gschema-translations.patch BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libhandy-1)
# 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: /usr/bin/appstream-util
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
@ -23,12 +18,6 @@ BuildRequires: itstool
BuildRequires: meson BuildRequires: meson
BuildRequires: vala 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
%description %description
Baobab is able to scan either specific directories or the whole filesystem, in Baobab is able to scan either specific directories or the whole filesystem, in
order to give the user a graphical tree representation including each order to give the user a graphical tree representation including each
@ -36,7 +25,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. any change made to your home folder as far as any mounted/unmounted device.
%prep %prep
%autosetup -p1 %autosetup -p1 -n %{name}-%{tarball_version}
%build %build
@ -56,27 +45,71 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.baobab.des
%files -f %{name}.lang %files -f %{name}.lang
%doc AUTHORS NEWS README %doc AUTHORS NEWS README.md
%license COPYING COPYING.docs %license COPYING COPYING.docs
%{_bindir}/baobab %{_bindir}/baobab
%{_datadir}/applications/org.gnome.baobab.desktop %{_datadir}/applications/org.gnome.baobab.desktop
%{_datadir}/dbus-1/services/org.gnome.baobab.service %{_datadir}/dbus-1/services/org.gnome.baobab.service
%{_datadir}/icons/hicolor/*/apps/baobab.png %{_datadir}/icons/hicolor/*/apps/org.gnome.baobab*.svg
%{_datadir}/icons/hicolor/symbolic/apps/baobab-symbolic.svg %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.baobab-symbolic.svg
%{_datadir}/glib-2.0/schemas/org.gnome.baobab.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.baobab.gschema.xml
%{_datadir}/metainfo/org.gnome.baobab.appdata.xml %{_datadir}/metainfo/org.gnome.baobab.appdata.xml
%{_mandir}/man1/baobab.1* %{_mandir}/man1/baobab.1*
%changelog %changelog
* Tue Oct 15 2019 Ondrej Holy <oholy@redhat.com> - 3.28.0-4 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 40.0-3
- Rebuild to ensure correct dist tag (rhbz#1725154) - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Mon Oct 14 2019 Ondrej Holy <oholy@redhat.com> - 3.28.0-3 * Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 40.0-2
- Add website link and update application name in About dialog (rhbz#1725154) - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jul 9 2019 Ondrej Holy <oholy@redhat.com> - 3.28.0-2 * Mon Mar 22 2021 Kalev Lember <klember@redhat.com> - 40.0-1
- Fix gschema translations (rhbz#1705583) - 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 * Mon Mar 12 2018 Kalev Lember <klember@redhat.com> - 3.28.0-1
- Update to 3.28.0 - Update to 3.28.0

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-9
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-40.0.tar.xz) = 31ab768f7e089c12717bc363111fe936f4a15986b69ee53b8f9aab19973ff5bf4970fdfa4d936af4d46673a9f08063518a6c314453e698e6068485152e400650