From 4368ccc7caf7ece01aa17c95ee5287c1f2f5ccc8 Mon Sep 17 00:00:00 2001 From: Ondrej Holy Date: Jun 01 2018 13:53:02 +0000 Subject: Fix setting GNOMELOCALEDIR --- diff --git a/baobab.spec b/baobab.spec index 05f8c16..606a9b9 100644 --- a/baobab.spec +++ b/baobab.spec @@ -2,13 +2,15 @@ Name: baobab Version: 3.28.0 -Release: 1%{?dist} +Release: 2%{?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-setting-GNOMELOCALEDIR.patch + BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} BuildRequires: /usr/bin/appstream-util BuildRequires: desktop-file-utils @@ -31,6 +33,7 @@ any change made to your home folder as far as any mounted/unmounted device. %prep %setup -q +%patch0 -p1 -b .build-Fix-setting-GNOMELOCALEDIR %build @@ -63,6 +66,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.baobab.des %changelog +* Fri Jun 1 2018 Ondrej Holy - 3.28.0-2 +- Fix setting GNOMELOCALEDIR + * Mon Mar 12 2018 Kalev Lember - 3.28.0-1 - Update to 3.28.0 diff --git a/build-Fix-setting-GNOMELOCALEDIR.patch b/build-Fix-setting-GNOMELOCALEDIR.patch new file mode 100644 index 0000000..d45da02 --- /dev/null +++ b/build-Fix-setting-GNOMELOCALEDIR.patch @@ -0,0 +1,26 @@ +From 884fb555173c46fcb4a80a5cc9cbd32bad8186ba Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Piotr=20Dr=C4=85g?= +Date: Fri, 16 Mar 2018 19:57:53 +0100 +Subject: [PATCH] build: Fix setting GNOMELOCALEDIR + +https://bugzilla.gnome.org/show_bug.cgi?id=794381 +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 30d996d..ad1b1d3 100644 +--- a/meson.build ++++ b/meson.build +@@ -23,7 +23,7 @@ conf.set_quoted('PACKAGE_NAME', meson.project_name()) + conf.set_quoted('PACKAGE_VERSION', meson.project_version()) + conf.set_quoted('VERSION', meson.project_version()) + conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) +-conf.set_quoted('GNOMELOCALEDIR', join_paths(get_option('prefix'), get_option('datadir'), '/locale')) ++conf.set_quoted('GNOMELOCALEDIR', join_paths(get_option('prefix'), get_option('localedir'))) + configure_file(output: 'config.h', configuration: conf) + config_h_dir = include_directories('.') + +-- +2.17.0 +