Fix setting GNOMELOCALEDIR

This commit is contained in:
Ondrej Holy 2018-06-01 15:52:36 +02:00
parent 2883687b79
commit 4368ccc7ca
2 changed files with 33 additions and 1 deletions

View File

@ -2,13 +2,15 @@
Name: baobab Name: baobab
Version: 3.28.0 Version: 3.28.0
Release: 1%{?dist} Release: 2%{?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/3.28/%{name}-%{version}.tar.xz
Patch0: build-Fix-setting-GNOMELOCALEDIR.patch
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} 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
@ -31,6 +33,7 @@ any change made to your home folder as far as any mounted/unmounted device.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .build-Fix-setting-GNOMELOCALEDIR
%build %build
@ -63,6 +66,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.baobab.des
%changelog %changelog
* 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

View File

@ -0,0 +1,26 @@
From 884fb555173c46fcb4a80a5cc9cbd32bad8186ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
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