Accepting request 612865 from GNOME:Apps

Add an upstream patch since I'm already touching the package:

- Add gcab-fix-installing-the-includes.patch: build-sys: fix
  installing the includes (bgo#793388). (forwarded request 612289 from iznogood)

OBS-URL: https://build.opensuse.org/request/show/612865
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gcab?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2018-06-02 09:55:24 +00:00 committed by Git OBS Bridge
commit c9ac863757
3 changed files with 34 additions and 0 deletions

View File

@ -0,0 +1,25 @@
From 150c330de1e65036250a2788a51245e37c7de0f7 Mon Sep 17 00:00:00 2001
From: Timo Gurr <timo.gurr@gmail.com>
Date: Thu, 1 Feb 2018 16:16:21 +0100
Subject: [PATCH] build-sys: fix installing the includes
https://bugzilla.gnome.org/show_bug.cgi?id=793388
---
libgcab/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libgcab/meson.build b/libgcab/meson.build
index 6ff8801..f939617 100644
--- a/libgcab/meson.build
+++ b/libgcab/meson.build
@@ -9,7 +9,7 @@ enums = gnome.mkenums(
c_template : 'gcab-enums.c.etemplate',
h_template : 'gcab-enums.h.etemplate',
install_header : true,
- install_dir : 'include/libgcab-1.0/libgcab',
+ install_dir : join_paths(get_option('includedir'), 'libgcab-1.0/libgcab'),
symbol_prefix : 'gcab',
identifier_prefix : 'GCab',
)
--
libgit2 0.27.0

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri May 25 17:57:52 UTC 2018 - bjorn.lie@gmail.com
- Add gcab-fix-installing-the-includes.patch: build-sys: fix
installing the includes (bgo#793388).
-------------------------------------------------------------------
Sat Mar 10 09:17:21 UTC 2018 - jengelh@inai.de

View File

@ -26,6 +26,8 @@ Url: http://ftp.gnome.org/pub/GNOME/sources/gcab
Source0: http://download.gnome.org/sources/gcab/1.1/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM gcab-revert-git-dep.patch bgo#793406 bjorn.lie@gmail.com -- Revert git dependency
Patch0: gcab-revert-git-dep.patch
# PATCH-FIX-UPSTREAM gcab-fix-installing-the-includes.patch bgo#793388 -- build-sys: fix installing the includes
Patch1: gcab-fix-installing-the-includes.patch
BuildRequires: gtk-doc
BuildRequires: meson
BuildRequires: pkgconfig
@ -91,6 +93,7 @@ libgcab.
-D docs=true \
-D introspection=true \
-D tests=false \
%{nil}
%meson_build
%install