63adfc import baobab-3.28.0-2.el8

Authored and Committed by centosrcm 5 years ago
    import baobab-3.28.0-2.el8
    
        
SOURCES/build-Fix-gschema-translations.patch ADDED
@@ -0,0 +1,63 @@
1
+ From 80f7e1c144103d52a877f2d42db6a427867591f6 Mon Sep 17 00:00:00 2001
2
+ From: Ondrej Holy <oholy@redhat.com>
3
+ Date: Thu, 14 Jun 2018 15:22:15 +0200
4
+ Subject: [PATCH] build: Fix gschema translations
5
+ MIME-Version: 1.0
6
+ Content-Type: text/plain; charset=UTF-8
7
+ Content-Transfer-Encoding: 8bit
8
+
9
+ After meson port, translations are merged in gschema file, which doesn't
10
+ work:
11
+
12
+ $ LANG=en_US gsettings describe org.gnome.baobab.preferences excluded-uris
13
+ Una lista d'URI t'as particiones que cal excluir de l'anal�s.
14
+
15
+ Translations should not be merged in gschema files and also I don't see any
16
+ other gschema file with merged translations in /usr/share/glib-2.0/schemas/.
17
+ Let's install gschema file as is. After this change, translations works as
18
+ expected.
19
+ ---
20
+ data/meson.build | 7 ++-----
21
+ ....baobab.gschema.xml.in => org.gnome.baobab.gschema.xml} | 0
22
+ po/POTFILES.in | 2 +-
23
+ 3 files changed, 3 insertions(+), 6 deletions(-)
24
+ rename data/{org.gnome.baobab.gschema.xml.in => org.gnome.baobab.gschema.xml} (100%)
25
+
26
+ diff --git a/data/meson.build b/data/meson.build
27
+ index 5b1ef00..98d1d69 100644
28
+ --- a/data/meson.build
29
+ +++ b/data/meson.build
30
+ @@ -22,11 +22,8 @@ appdata_file = i18n.merge_file(
31
+ install_dir: join_paths(get_option('datadir'), 'metainfo'),
32
+ )
33
+
34
+ -gschema_file = i18n.merge_file(
35
+ - input: 'org.gnome.baobab.gschema.xml.in',
36
+ - output: 'org.gnome.baobab.gschema.xml',
37
+ - po_dir: '../po',
38
+ - install: true,
39
+ +install_data (
40
+ + 'org.gnome.baobab.gschema.xml',
41
+ install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas')
42
+ )
43
+
44
+ diff --git a/data/org.gnome.baobab.gschema.xml.in b/data/org.gnome.baobab.gschema.xml
45
+ similarity index 100%
46
+ rename from data/org.gnome.baobab.gschema.xml.in
47
+ rename to data/org.gnome.baobab.gschema.xml
48
+ diff --git a/po/POTFILES.in b/po/POTFILES.in
49
+ index 0c9452a..f3d6521 100644
50
+ --- a/po/POTFILES.in
51
+ +++ b/po/POTFILES.in
52
+ @@ -2,7 +2,7 @@
53
+ # Please keep this file sorted alphabetically.
54
+ data/org.gnome.baobab.appdata.xml.in
55
+ data/org.gnome.baobab.desktop.in
56
+ -data/org.gnome.baobab.gschema.xml.in
57
+ +data/org.gnome.baobab.gschema.xml
58
+ src/baobab-application.vala
59
+ src/baobab-cellrenderers.vala
60
+ src/baobab-location-list.ui
61
+ --
62
+ 2.21.0
63
+
file modified
+7 -2
SPECS/baobab.spec CHANGED
@@ -2,13 +2,15 @@
2
2
3
3
Name: baobab
4
4
Version: 3.28.0
5
- Release: 1%{?dist}
5
+ Release: 2%{?dist}
6
6
Summary: A graphical directory tree analyzer
7
7
8
8
License: GPLv2+ and GFDL
9
9
URL: https://wiki.gnome.org/Apps/Baobab
10
10
Source0: https://download.gnome.org/sources/baobab/3.28/%{name}-%{version}.tar.xz
11
11
12
+ Patch0: build-Fix-gschema-translations.patch
13
+
12
14
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
13
15
BuildRequires: /usr/bin/appstream-util
14
16
BuildRequires: desktop-file-utils
@@ -30,7 +32,7 @@ directory size or percentage in the branch. It also auto-detects in real-time
30
32
any change made to your home folder as far as any mounted/unmounted device.
31
33
32
34
%prep
33
- %setup -q
35
+ %autosetup -p1
34
36
35
37
36
38
%build
@@ -63,6 +65,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.baobab.des
63
65
64
66
65
67
%changelog
68
+ * Tue Jul 9 2019 Ondrej Holy <oholy@redhat.com> - 3.28.0-2
69
+ - Fix gschema translations (rhbz#1705583)
70
+
66
71
* Mon Mar 12 2018 Kalev Lember <klember@redhat.com> - 3.28.0-1
67
72
- Update to 3.28.0
68
73