Accepting request 572080 from GNOME:Factory

- Add 0001-build-Set-PKGDATADIR-to-gnome-color-manager.patch:
  data files where looked up in the wrong directory (forwarded request 570828 from StefanBruens)

OBS-URL: https://build.opensuse.org/request/show/572080
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-color-manager?expand=0&rev=60
This commit is contained in:
Dominique Leuenberger 2018-02-03 14:38:37 +00:00 committed by Git OBS Bridge
commit 6195dd5786
3 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,29 @@
From 635ee49b83db46d2623826928cfa5202bdf1402a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Mon, 29 Jan 2018 20:45:01 +0100
Subject: [PATCH] build: Set PKGDATADIR to gnome-color-manager
It was set to gnome-software, which made any of the gcm-*
tools unable to find any of its data files.
https://bugzilla.gnome.org/show_bug.cgi?id=791158
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 3fd0963..d304ed1 100644
--- a/meson.build
+++ b/meson.build
@@ -85,7 +85,7 @@ prefixed_localedir = join_paths(get_option('prefix'), get_option('localedir'))
prefixed_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
prefixed_mandir = join_paths(get_option('prefix'), get_option('mandir'))
prefixed_datadir = join_paths(get_option('prefix'), get_option('datadir'))
-prefixed_pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'gnome-software')
+prefixed_pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'gnome-color-manager')
libgio = dependency('gio-2.0', version : '>= 2.25.9')
libgtk = dependency('gtk+-3.0', version : '>= 2.91.0')
--
2.16.1

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 29 19:48:52 UTC 2018 - stefan.bruens@rwth-aachen.de
- Add 0001-build-Set-PKGDATADIR-to-gnome-color-manager.patch:
data files where looked up in the wrong directory
-------------------------------------------------------------------
Mon Sep 11 13:02:01 UTC 2017 - zaitor@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package gnome-color-manager
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Luis Medinas, Portugal
#
# All modifications and additions to the file contributed by third parties
@ -27,6 +27,8 @@ Url: http://projects.gnome.org/gnome-color-manager
Source: http://download.gnome.org/sources/gnome-color-manager/3.26/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM gnome-color-manager-meson.patch bgo#786424 dimstar@opensuse.org -- Do not hardcode directory names
Patch0: gnome-color-manager-meson.patch
# PATCH-FIX-UPSTREAM 0001-build-Set-PKGDATADIR-to-gnome-color-manager.patch bgo#791158
Patch1: 0001-build-Set-PKGDATADIR-to-gnome-color-manager.patch
BuildRequires: docbook-utils
BuildRequires: gcc-c++
BuildRequires: libtiff-devel
@ -64,6 +66,7 @@ install and generate color profiles in the GNOME desktop.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
translation-update-upstream
%build