From 562bad6256fae00457f20685d5aed5c36f66e5873d347eb20b4308e715fd2c31 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 21 Nov 2017 13:38:24 +0000 Subject: [PATCH] Accepting request 544001 from home:Zaitor:branches:X11:XOrg - Add U_xkbcomp_pkgconfig-add-bindir.patch: pkgconfig: Add our bindir to xkbcomp.pc. OBS-URL: https://build.opensuse.org/request/show/544001 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkbcomp?expand=0&rev=17 --- U_xkbcomp_pkgconfig-add-bindir.patch | 20 ++++++++++++++++++++ xkbcomp.changes | 6 ++++++ xkbcomp.spec | 2 ++ 3 files changed, 28 insertions(+) create mode 100644 U_xkbcomp_pkgconfig-add-bindir.patch diff --git a/U_xkbcomp_pkgconfig-add-bindir.patch b/U_xkbcomp_pkgconfig-add-bindir.patch new file mode 100644 index 0000000..5059bae --- /dev/null +++ b/U_xkbcomp_pkgconfig-add-bindir.patch @@ -0,0 +1,20 @@ +From 3e2a6ad4edfbf21c3f76f8319f0039b7f589944f Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Mon, 6 Nov 2017 12:54:41 -0500 +Subject: pkgconfig: Add our bindir to xkbcomp.pc + +Reviewed-by: Daniel Stone +Signed-off-by: Adam Jackson + +diff --git a/xkbcomp.pc.in b/xkbcomp.pc.in +index b8d6023..4d138c8 100644 +--- a/xkbcomp.pc.in ++++ b/xkbcomp.pc.in +@@ -1,4 +1,5 @@ + prefix=@prefix@ ++bindir=@bindir@ + datarootdir=@datarootdir@ + datadir=@datadir@ + xkbconfigdir=@XKBCONFIGROOT@ +-- +cgit v0.10.2 diff --git a/xkbcomp.changes b/xkbcomp.changes index 0477740..3a76984 100644 --- a/xkbcomp.changes +++ b/xkbcomp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 20 22:42:36 UTC 2017 - zaitor@opensuse.org + +- Add U_xkbcomp_pkgconfig-add-bindir.patch: pkgconfig: Add our + bindir to xkbcomp.pc. + ------------------------------------------------------------------- Tue May 2 12:21:16 UTC 2017 - sndirsch@suse.com diff --git a/xkbcomp.spec b/xkbcomp.spec index 4e2f337..695fb08 100644 --- a/xkbcomp.spec +++ b/xkbcomp.spec @@ -26,6 +26,7 @@ Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 Source1: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2.sig Source2: %{name}.keyring +Patch0: U_xkbcomp_pkgconfig-add-bindir.patch BuildRequires: bison BuildRequires: pkg-config BuildRequires: pkgconfig(x11) @@ -51,6 +52,7 @@ into one of several output formats. %prep %setup -q +%patch0 -p1 %build %configure