diff --git a/gcab-fix-installing-the-includes.patch b/gcab-fix-installing-the-includes.patch new file mode 100644 index 0000000..d57e9f6 --- /dev/null +++ b/gcab-fix-installing-the-includes.patch @@ -0,0 +1,25 @@ +From 150c330de1e65036250a2788a51245e37c7de0f7 Mon Sep 17 00:00:00 2001 +From: Timo Gurr +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 diff --git a/gcab.changes b/gcab.changes index 7aa3a74..877a594 100644 --- a/gcab.changes +++ b/gcab.changes @@ -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 diff --git a/gcab.spec b/gcab.spec index dea1874..598a92d 100644 --- a/gcab.spec +++ b/gcab.spec @@ -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